MFB: Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1

response)

diff --git a/NEWS b/NEWS
index 6ee27106ee125865726f3150cbd1b4a8bc427ca7..ee582191b5a866093b6f334a3ce785ff5a1a2a9b 100644 (file)
--- 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 85ca3314dd6a948cebd4b5c4b5449d34ff6dfa84..524a10f52a66bc2acd8468fe6e5308e1ac4333e8 100644 (file)
--- 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");
                }
        }