mirror of
https://github.com/danog/phpseclib.git
synced 2024-12-12 09:09:39 +01:00
Merge branch '2.0' into 3.0-channel-closure
This commit is contained in:
commit
81ffb62c20
@ -1031,7 +1031,10 @@ abstract class ASN1
|
||||
case self::TYPE_GENERALIZED_TIME:
|
||||
$format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
|
||||
$format.= 'mdHis';
|
||||
// if $source does _not_ include timezone information within it then assume that the timezone is GMT
|
||||
$date = new DateTime($source, new DateTimeZone('GMT'));
|
||||
// if $source _does_ include timezone information within it then convert the time to GMT
|
||||
$date->setTimezone(new DateTimeZone('GMT'));
|
||||
$value = $date->format($format) . 'Z';
|
||||
break;
|
||||
case self::TYPE_BIT_STRING:
|
||||
|
@ -2204,6 +2204,7 @@ class SFTP extends SSH2
|
||||
}
|
||||
if ($this->channel_close) {
|
||||
$this->init_sftp_connection();
|
||||
return false;
|
||||
} else {
|
||||
throw new \UnexpectedValueException('Expected NET_SFTP_DATA or NET_SFTP_STATUS. '
|
||||
. 'Got packet type: ' . $this->packet_type);
|
||||
@ -2938,7 +2939,10 @@ class SFTP extends SSH2
|
||||
// SFTP packet length
|
||||
while (strlen($this->packet_buffer) < 4) {
|
||||
$temp = $this->get_channel_packet(self::CHANNEL, true);
|
||||
if (is_bool($temp)) {
|
||||
if ($temp === true) {
|
||||
if ($this->channel_status[NET_SFTP_CHANNEL] === NET_SSH2_MSG_CHANNEL_CLOSE) {
|
||||
$this->channel_close = true;
|
||||
}
|
||||
$this->packet_type = false;
|
||||
$this->packet_buffer = '';
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user