Merge branch '2.0'

This commit is contained in:
terrafrost 2016-08-11 23:10:43 -05:00
commit da0c41ddac

View File

@ -1071,10 +1071,20 @@ class SSH2
} }
$line.= "$temp\n"; $line.= "$temp\n";
if (substr($line, -2) == "\r\n") {
break; // 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;
} }
$data.= $line; $data.= $line;
} }