Merge branch '1.0' into 3.0

This commit is contained in:
terrafrost 2021-07-28 21:00:24 -05:00
commit a19c6ab7e6

View File

@ -479,7 +479,10 @@ class SFTP extends SSH2
$this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN; $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN;
$this->get_channel_packet(self::CHANNEL, true); $response = $this->get_channel_packet(self::CHANNEL, true);
if ($response === true && $this->isTimeout()) {
return false;
}
$packet = Strings::packSSH2( $packet = Strings::packSSH2(
'CNsbs', 'CNsbs',
@ -517,6 +520,8 @@ class SFTP extends SSH2
if ($response === false) { if ($response === false) {
return false; return false;
} }
} else if ($response === true && $this->isTimeout()) {
return false;
} }
$this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA; $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA;