Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2021-05-14 12:56:16 -05:00
commit 574382e06a

View File

@ -3197,7 +3197,7 @@ class SSH2
$read = [$this->fsock];
$write = $except = null;
if ($this->curTimeout <= 0) {
if (!$this->curTimeout) {
if ($this->keepAlive <= 0) {
@stream_select($read, $write, $except, null);
} else {