Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2018-05-19 07:48:33 -05:00
commit bf71150433

View File

@ -1124,11 +1124,12 @@ class SSH2
}
$elapsed = microtime(true) - $start;
$this->curTimeout-= $elapsed;
if ($this->curTimeout <= 0) {
$this->is_timeout = true;
return false;
if ($this->curTimeout) {
$this->curTimeout-= $elapsed;
if ($this->curTimeout < 0) {
$this->is_timeout = true;
return false;
}
}
}
@ -3592,10 +3593,6 @@ class SSH2
if ($client_channel == -1 && $response === true) {
return true;
}
if (!strlen($response)) {
return '';
}
if (!strlen($response)) {
return false;
}