Merge branch '2.0'

This commit is contained in:
terrafrost 2018-05-19 07:48:42 -05:00
commit 8da15ab19b

View File

@ -1138,13 +1138,14 @@ class SSH2
}
$elapsed = microtime(true) - $start;
if ($this->curTimeout) {
$this->curTimeout-= $elapsed;
if ($this->curTimeout <= 0) {
if ($this->curTimeout < 0) {
$this->is_timeout = true;
return false;
}
}
}
$this->identifier = $this->generate_identifier();
@ -3636,10 +3637,6 @@ class SSH2
if ($client_channel == -1 && $response === true) {
return true;
}
if (!strlen($response)) {
return '';
}
if (!strlen($response)) {
return false;
}