From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 13 Dec 2009 15:44:22 +0000 (+0000)
Subject: Fixed bug #50451 (http wrapper breaks on 2048 char long headers)
X-Git-Tag: php-5.4.0alpha1~191^2~2235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cea66f6a245bb650b0e731012f892e6ab9e7fc2c;p=php

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

# Improvement on the fix for bug #49851
---

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 4f5095b72e..c400d13132 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -653,9 +653,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, ZSTR(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, ZSTR(http_header_line), HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
-				continue;
+			if (*e != '\n') {
+				do { /* partial header */
+					php_stream_get_line(stream, ZSTR(http_header_line), HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
+					e = http_header_line + http_header_line_length - 1;
+				} while (*e != '\n');
 			}
 			while (*e == '\n' || *e == '\r') {
 				e--;