From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 10 Dec 2009 03:23:05 +0000 (+0000)
Subject: Fixed bug #49851 (http wrapper breaks on 1024 char long headers).
X-Git-Tag: php-5.3.2RC1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47b3371122d03549af88a57d05442cf66c3eb83b;p=php

Fixed bug #49851 (http wrapper breaks on 1024 char long headers).
---

diff --git a/NEWS b/NEWS
index 2d81093a87..4be86efe9f 100644
--- a/NEWS
+++ b/NEWS
@@ -95,6 +95,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 #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 0e598909fa..9e144b7954 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -610,6 +610,10 @@ 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);
+				continue;
+			}
 			while (*e == '\n' || *e == '\r') {
 				e--;
 			}