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

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 5452b2c141b5d18fd37520b2ccaa47f36466a69b..0f4231e9d69f2997682c773c836369d0b7b8c4ce 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -398,7 +398,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 0de6c76eb4d1700e1d503ac6a051b7c018d51953..b8c4b7951076fd49aa269b9aea9d6dda535e126a 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -427,7 +427,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);