Merge branch 'keepalive-1.0' into keepalive-2.0

terrafrost · terrafrost · commit 43b27082547d · 2020-12-15T23:36:42.000-06:00
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
@@ -3377,9 +3377,6 @@ function _get_binary_packet($skip_channel_filter = false)
                 // on windows this returns a "Warning: Invalid CRT parameters detected" error
                 if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
                     $this->is_timeout = true;
-                    if ($client_channel == self::CHANNEL_EXEC && !$this->request_pty) {
-                        $this->_close_channel($client_channel);
-                    }
                     return true;
                 }
                 $elapsed = microtime(true) - $start;
@@ -3747,6 +3744,9 @@ function _get_channel_packet($client_channel, $skip_extended = false)
                 $this->binary_packet_buffer = false;
             } else {
                 $response = $this->_get_binary_packet(true);
+                if ($response === true && $this->is_timeout && $client_channel == self::CHANNEL_EXEC && !$this->request_pty) {
+                    $this->_close_channel($client_channel);
+                }
                 if ($response === false) {
                     $this->bitmap = 0;
                     user_error('Connection closed by server');
