octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 10:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2016-11-08 09:22:05 -06:00
commit a47eccf6f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpseclib/Net/SSH2.php
View File

@ -1021,6 +1021,10 @@ class SSH2
} }
} }
$this->identifier = $this->_generate_identifier();
fputs($this->fsock, $this->identifier . "\r\n");
/* According to the SSH2 specs, /* According to the SSH2 specs,
"The server MAY send other lines of data before sending the version "The server MAY send other lines of data before sending the version
@ -1082,8 +1086,6 @@ class SSH2
$extra = $matches[1]; $extra = $matches[1];
$this->identifier = $this->_generate_identifier();
if (defined('NET_SSH2_LOGGING')) { if (defined('NET_SSH2_LOGGING')) {
$this->_append_log('<-', $matches[0]); $this->_append_log('<-', $matches[0]);
$this->_append_log('->', $this->identifier . "\r\n"); $this->_append_log('->', $this->identifier . "\r\n");
@ -1099,8 +1101,6 @@ class SSH2
return false; return false;
} }
fputs($this->fsock, $this->identifier . "\r\n");
$response = $this->_get_binary_packet(); $response = $this->_get_binary_packet();
if ($response === false) { if ($response === false) {
user_error('Connection closed by server'); user_error('Connection closed by server');