pajoye Fri, 05 Feb 2010 19:34:47 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294572
Log: - Fix bug #50940 Bug: http://bugs.php.net/50940 (Closed) All Apache SAPI sets content length wrong Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/NEWS _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c U php/php-src/branches/PHP_5_3_2/sapi/apache2filter/sapi_apache2.c U php/php-src/branches/PHP_5_3_2/sapi/apache2handler/sapi_apache2.c _U php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_2 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-05 18:59:05 UTC (rev 294571) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-05 19:34:47 UTC (rev 294572) @@ -17,6 +17,8 @@ links or invalid paths. (Pierre) - Fixed error output to stderr on Windows. (Pierre) +- Fixed bug #50940 Custom content-length set incorrectly in Apache sapis. + (Brian France, Rasmus) - Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX). (Ilia) - Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation). Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571 /php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c =================================================================== --- php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c 2010-02-05 18:59:05 UTC (rev 294571) +++ php/php-src/branches/PHP_5_3_2/sapi/apache/mod_php5.c 2010-02-05 19:34:47 UTC (rev 294572) @@ -196,6 +196,8 @@ if (!strcasecmp(header_name, "Content-Type")) { r->content_type = pstrdup(r->pool, header_content); + } else if (!strcasecmp(header_name, "Content-Length")) { + ap_set_content_length(r, strtol(header_content, (char **)NULL, 10)); } else if (!strcasecmp(header_name, "Set-Cookie")) { table_add(r->headers_out, header_name, header_content); } else if (op == SAPI_HEADER_REPLACE) { Modified: php/php-src/branches/PHP_5_3_2/sapi/apache2filter/sapi_apache2.c =================================================================== --- php/php-src/branches/PHP_5_3_2/sapi/apache2filter/sapi_apache2.c 2010-02-05 18:59:05 UTC (rev 294571) +++ php/php-src/branches/PHP_5_3_2/sapi/apache2filter/sapi_apache2.c 2010-02-05 19:34:47 UTC (rev 294572) @@ -127,6 +127,8 @@ if (!strcasecmp(sapi_header->header, "content-type")) ctx->r->content_type = apr_pstrdup(ctx->r->pool, val); + else if (!strcasecmp(sapi_header->header, "content-length")) + ap_set_content_length(ctx->r, strtol(val, (char **)NULL, 10)); else if (op == SAPI_HEADER_REPLACE) apr_table_set(ctx->r->headers_out, sapi_header->header, val); else Modified: php/php-src/branches/PHP_5_3_2/sapi/apache2handler/sapi_apache2.c =================================================================== --- php/php-src/branches/PHP_5_3_2/sapi/apache2handler/sapi_apache2.c 2010-02-05 18:59:05 UTC (rev 294571) +++ php/php-src/branches/PHP_5_3_2/sapi/apache2handler/sapi_apache2.c 2010-02-05 19:34:47 UTC (rev 294572) @@ -119,6 +119,8 @@ efree(ctx->content_type); } ctx->content_type = estrdup(val); + } else if (!strcasecmp(sapi_header->header, "content-length")) { + ap_set_content_length(ctx->r, strtol(val, (char **)NULL, 10)); } else if (op == SAPI_HEADER_REPLACE) { apr_table_set(ctx->r->headers_out, sapi_header->header, val); } else { Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:29815-29816,265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:29815-29816,265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
