mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-16 02:07:09 +00:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
a47eccf6f9
@ -1021,6 +1021,10 @@ class SSH2
|
||||
}
|
||||
}
|
||||
|
||||
$this->identifier = $this->_generate_identifier();
|
||||
|
||||
fputs($this->fsock, $this->identifier . "\r\n");
|
||||
|
||||
/* According to the SSH2 specs,
|
||||
|
||||
"The server MAY send other lines of data before sending the version
|
||||
@ -1082,8 +1086,6 @@ class SSH2
|
||||
|
||||
$extra = $matches[1];
|
||||
|
||||
$this->identifier = $this->_generate_identifier();
|
||||
|
||||
if (defined('NET_SSH2_LOGGING')) {
|
||||
$this->_append_log('<-', $matches[0]);
|
||||
$this->_append_log('->', $this->identifier . "\r\n");
|
||||
@ -1099,8 +1101,6 @@ class SSH2
|
||||
return false;
|
||||
}
|
||||
|
||||
fputs($this->fsock, $this->identifier . "\r\n");
|
||||
|
||||
$response = $this->_get_binary_packet();
|
||||
if ($response === false) {
|
||||
user_error('Connection closed by server');
|
||||
|
Loading…
Reference in New Issue
Block a user