svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/http_fopen_wrapper.c trunk/ext/standard/http_fopen_wrapper.c

iliaa Sun, 13 Dec 2009 15:44:22 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292079 Log: Fixed bug #50451 (http wrapper breaks on 2048 char long headers) # Improvement on the fix for bug #49851 Bugs: http://bugs.php.net/50451 (Assigned) http wrapper breaks on 2048 char long headers http://bugs.php.net/49851 (Closed) http wrapper breaks on 1024 char long headers Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c U php/php-src/trunk/ext/standard/http_fopen_wrapper.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-12-13 15:18:58 UTC (rev 292078) +++ php/php-src/branches/PHP_5_3/NEWS 2009-12-13 15:44:22 UTC (rev 292079) @@ -98,7 +98,7 @@ - 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 Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2009-12-13 15:18:58 UTC (rev 292078) +++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2009-12-13 15:44:22 UTC (rev 292079) @@ -610,8 +610,11 @@ 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') { Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c =================================================================== --- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-12-13 15:18:58 UTC (rev 292078) +++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-12-13 15:44:22 UTC (rev 292079) @@ -653,9 +653,11 @@ 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--;