From e61a8d577cd6d7b146f4df36e9b87bfe1d397a7a Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Fri, 12 Dec 2003 17:19:18 +0000 Subject: [PATCH] MFH: Fixed bug #26604 (Apache2 SAPIs implicitly disable Keep-Alive). (Ilia) --- NEWS | 1 + sapi/apache2filter/sapi_apache2.c | 1 - sapi/apache2handler/sapi_apache2.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 0bcbc88a80..b160c90fdd 100644 --- 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 08f413cd3c..20b03212c7 100644 --- 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 b2384b1249..b777071eb0 100644 --- 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); -- 2.50.1