Fixed bug #50451 (http wrapper breaks on 2048 char long headers)

# Improvement on the fix for bug #49851

diff --git a/NEWS b/NEWS
index 3d059219ba68844fa23b20504e3e0392ea2dd688..83b236178b56b999269b9e9d0ba0e29cce12e8c9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -98,7 +98,7 @@ PHP                                                                        NEWS
 - Fixed bug #49866 (Making reference on string offsets crashes PHP). (Dmitry)
 - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
   sjoerd at php dot net)
-- Fixed bug #49851 (http wrapper breaks on 1024 char long headers). (Ilia)
+- Fixed bug #49851, #50451 (http wrapper breaks on 1024 char long headers). (Ilia)
 - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
   (Ilia, wmeler at wp-sa dot pl)
 - Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 9e144b79544ef57a588b3dad419c9899506a142c..3ca614b77154794d7460ca706d805bab79326665 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -610,8 +610,11 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
                size_t http_header_line_length;
                if (php_stream_get_line(stream, http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) && *http_header_line != '\n' && *http_header_line != '\r') {
                        char *e = http_header_line + http_header_line_length - 1;
-                       if (*e != '\n') { /* partial header */
-                               php_stream_get_line(stream, http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
+                       if (*e != '\n') {
+                               do { /* partial header */
+                                       php_stream_get_line(stream, http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
+                                       e = http_header_line + http_header_line_length - 1;
+                               } while (*e != '\n');
                                continue;
                        }
                        while (*e == '\n' || *e == '\r') {