Merge branch 'update-auto-channel-close-2.0' into update-auto-channel-close-master

This commit is contained in:
terrafrost 2019-07-12 07:55:31 -05:00
commit 353ad158b4

View File

@ -3590,7 +3590,7 @@ class SSH2
// on windows this returns a "Warning: Invalid CRT parameters detected" error // on windows this returns a "Warning: Invalid CRT parameters detected" error
if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) { if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
$this->is_timeout = true; $this->is_timeout = true;
if ($client_channel == NET_SSH2_CHANNEL_EXEC && !$this->request_pty) { if ($client_channel == self::CHANNEL_EXEC && !$this->request_pty) {
$this->close_channel($client_channel); $this->close_channel($client_channel);
} }
return true; return true;
@ -3625,7 +3625,7 @@ class SSH2
switch ($type) { switch ($type) {
case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA: case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
/* /*
if ($client_channel == NET_SSH2_CHANNEL_EXEC) { if ($client_channel == self::CHANNEL_EXEC) {
$this->send_channel_packet($client_channel, chr(0)); $this->send_channel_packet($client_channel, chr(0));
} }
*/ */