danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-12 00:59:48 +01:00
Code Issues Projects Releases Wiki Activity

SSH2: i incorrectly thought i had saved when i did git commit -a

Browse Source
This commit is contained in:
terrafrost 2016-06-11 19:38:23 -05:00
parent 2bae0c3881
commit 68a09b8af0
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpseclib/Net/SSH2.php
View File

@ -1096,14 +1096,8 @@ class SSH2
$this->errors[] = utf8_decode($data);
}
<<<<<<< HEAD
if ($matches[1] != '1.99' && $matches[1] != '2.0') {
throw new \RuntimeException("Cannot connect to SSH $matches[1] servers");
=======
if ($matches[3] != '1.99' && $matches[3] != '2.0') {
user_error("Cannot connect to SSH $matches[3] servers");
return false;
>>>>>>> 2.0
throw new \RuntimeException("Cannot connect to SSH $matches[1] servers");
}
fputs($this->fsock, $this->identifier . "\r\n");