MFH: Fixed bug #26604 (Apache2 SAPIs implicitly disable Keep-Alive). (Ilia)

diff --git a/NEWS b/NEWS
index 0bcbc88a802646877a978eb4aeb1ec6ff8f80668..b160c90fdde9116112bc7654ec1b826ce04d09db 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ PHP 4                                                                      NEWS
   (Jani)
 - Fixed header handler in NSAPI SAPI module (header->replace was ignored,
   send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26604 (Apache2 SAPIs implicitly disable Keep-Alive). (Ilia)
 - Fixed bug #26565 (strtotime("this month") resolving to the wrong month).
   (Jani)
 - Fixed bug #26564 (ncurses5 has headers in PREFIX/include/ncurses/). (Jani)

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 08f413cd3caabc952f160dea5dee665ccabfbc60..20b03212c7a76372274455ffbf4ed4934ec236b7 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -397,7 +397,6 @@ static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx TSRMLS_DC)
        apr_table_unset(f->r->headers_out, "Last-Modified");
        apr_table_unset(f->r->headers_out, "Expires");
        apr_table_unset(f->r->headers_out, "ETag");
-       apr_table_unset(f->r->headers_in, "Connection");
        if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(f->r))) {
                auth = apr_table_get(f->r->headers_in, "Authorization");
                php_handle_auth_data(auth TSRMLS_CC);

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index b2384b12491f67b3543ed18d99d8ce7a3844a7dd..b777071eb037af0173bbe7e94973260218ba52c6 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -432,7 +432,6 @@ static void php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
        apr_table_unset(r->headers_out, "Last-Modified");
        apr_table_unset(r->headers_out, "Expires");
        apr_table_unset(r->headers_out, "ETag");
-       apr_table_unset(r->headers_in, "Connection");
        if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) {
                auth = apr_table_get(r->headers_in, "Authorization");
                php_handle_auth_data(auth TSRMLS_CC);