Merge branch 'keepalive-2.0' into keepalive-3.0

This commit is contained in:
terrafrost 2020-12-16 08:36:43 -06:00
commit 32bfbcd7d2

View File

@ -3689,8 +3689,11 @@ class SSH2
$this->binary_packet_buffer = false; $this->binary_packet_buffer = false;
} else { } else {
$response = $this->get_binary_packet(true); $response = $this->get_binary_packet(true);
if ($response === true && $this->is_timeout && $client_channel == self::CHANNEL_EXEC && !$this->request_pty) { if ($response === true && $this->is_timeout)
$this->close_channel($client_channel); if ($client_channel == self::CHANNEL_EXEC && !$this->request_pty) {
$this->close_channel($client_channel);
}
return true;
} }
if ($response === false) { if ($response === false) {
$this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST); $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);