iliaa Thu Nov 9 00:13:39 2006 UTC
Modified files:
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFB: 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.75&r2=1.76&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.75
php-src/sapi/apache2handler/sapi_apache2.c:1.76
--- php-src/sapi/apache2handler/sapi_apache2.c:1.75 Mon Oct 23 19:17:51 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 9 00:13:39 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.75 2006/10/23 19:17:51 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.76 2006/11/09 00:13:39 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,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
