iliaa Thu Nov 9 00:13:27 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
Fixed bug #38602 (header( "HTTP/1.0 ..." ) does not change proto version).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.7&r2=1.57.2.10.2.8&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.7
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.8
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.7 Fri Nov 3
13:51:47 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 9 00:13:26 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.7 2006/11/03 13:51:47 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.8 2006/11/09 00:13:26 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -129,9 +129,14 @@
/* httpd requires that r->status_line is set to the first digit of
* the status-code: */
- if (sline && strlen(sline) > 12 && strncmp(sline, "HTTP/1.", 7) == 0
- && sline[8] == ' ') {
+ if (sline && strlen(sline) > 12 && strncmp(sline, "HTTP/1.", 7) == 0 &&
sline[8] == ' ') {
ctx->r->status_line = apr_pstrdup(ctx->r->pool, sline + 9);
+ ctx->r->proto_num = 1000 + (sline[7]-'0');
+ if ((sline[7]-'0') == 0) {
+ apr_table_set(ctx->r->subprocess_env,
"force-response-1.0", "true");
+ } else {
+ apr_table_set(ctx->r->subprocess_env,
"force-response-1.1", "true");
+ }
}
/* call ap_set_content_type only once, else each time we call it,
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.341&r2=1.2027.2.547.2.342&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.341 php-src/NEWS:1.2027.2.547.2.342
--- php-src/NEWS:1.2027.2.547.2.341 Wed Nov 8 19:05:41 2006
+++ php-src/NEWS Thu Nov 9 00:13:26 2006
@@ -45,6 +45,8 @@
read valid db). (Marcus)
- Fixed bug #38680 (Added missing handling of basic types in json_decode).
(Ilia)
+- Fixed bug #38602 (header( "HTTP/1.0 ..." ) does not change proto version).
+ (Ilia)
- Fixed bug #38536 (SOAP returns an array of values instead of an object).
(Dmitry)
- Fixed bug #33282 (Re-assignment by reference does not clear the is_ref flag)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
