octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-26 03:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

Browse Source
This commit is contained in:
terrafrost 2024-08-25 14:11:04 -05:00
commit 70416554a4
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpseclib/Net/SSH2.php
View File

@ -1417,21 +1417,13 @@ class SSH2
if ($temp === false) { if ($temp === false) {
throw new \RuntimeException('Error reading from socket'); throw new \RuntimeException('Error reading from socket');
} }
$line .= $temp;
if (strlen($temp) == 255) { if (strlen($temp) == 255) {
continue; continue;
} }
$line .= "$temp\n"; $line .= "\n";
// quoting RFC4253, "Implementers who wish to maintain
// compatibility with older, undocumented versions of this protocol may
// want to process the identification string without expecting the
// presence of the carriage return character for reasons described in
// Section 5 of this document."
//if (substr($line, -2) == "\r\n") {
// break;
//}
break; break;
} }
@ -1450,7 +1442,7 @@ class SSH2
$extra = $matches[1]; $extra = $matches[1];
$this->server_identifier = trim($temp, "\r\n"); $this->server_identifier = trim($data, "\r\n");
if (strlen($extra)) { if (strlen($extra)) {
$this->errors[] = $data; $this->errors[] = $data;
} }