Merge branch '2.0'

2024-11-16 02:07:09 +00:00 · 2016-08-11 23:10:43 -05:00 · 2016-08-11 23:10:43 -05:00 · da0c41ddac
commit da0c41ddac
parent cc75d317a8 c20b661a44
1 changed files with 13 additions and 3 deletions
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@ -1071,10 +1071,20 @@ class SSH2
                }

                $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;
        }