summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-01-16 15:50:37 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-01-16 15:50:37 +0000
commit23994f91500e82e9c99cd43d8b9ca04ce24123f8 (patch)
tree9f43b882584afcd45942c8adf8deeeca35d49bd7
parentb42398f850a43297ef2f5aa95e82a56566ad29f5 (diff)
downloadphp-git-23994f91500e82e9c99cd43d8b9ca04ce24123f8.tar.gz
MFB: Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
response)
-rw-r--r--NEWS2
-rw-r--r--sapi/apache2handler/sapi_apache2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 6ee27106ee..ee582191b5 100644
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,8 @@ PHP NEWS
- Fixed bug #42945 (preg_split() swallows part of the string). (Nuno)
- Fixed bug #42937 (__call() method not invoked when methods are called on
parent from child class). (Dmitry)
+- Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
+ response). (Ilia)
- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
- Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer).
(Dmitry)
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 85ca3314dd..524a10f52a 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -134,8 +134,6 @@ php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
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");
}
}