Merge branch '2.0'

This commit is contained in:
terrafrost 2018-12-16 11:45:37 -06:00
commit b76a67dfb4

View File

@ -3724,7 +3724,12 @@ class SSH2
$response = $this->binary_packet_buffer; $response = $this->binary_packet_buffer;
$this->binary_packet_buffer = false; $this->binary_packet_buffer = false;
} else { } else {
if ($this->curTimeout) { $read = array($this->fsock);
$write = $except = null;
if (!$this->curTimeout) {
@stream_select($read, $write, $except, null);
} else {
if ($this->curTimeout < 0) { if ($this->curTimeout < 0) {
$this->is_timeout = true; $this->is_timeout = true;
return true; return true;