iliaa Fri Dec 12 12:19:11 2003 EDT Modified files: /php-src/sapi/apache2handler sapi_apache2.c /php-src/sapi/apache2filter sapi_apache2.c Log: Fixed bug #26604 (Apache2 SAPIs implicitly disable Keep-Alive). (Ilia) Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.29 php-src/sapi/apache2handler/sapi_apache2.c:1.30 --- php-src/sapi/apache2handler/sapi_apache2.c:1.29 Tue Oct 21 07:48:31 2003 +++ php-src/sapi/apache2handler/sapi_apache2.c Fri Dec 12 12:19:10 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.29 2003/10/21 11:48:31 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.30 2003/12/12 17:19:10 iliaa Exp $ */ #include <fcntl.h> @@ -427,7 +427,6 @@ 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); Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.119 php-src/sapi/apache2filter/sapi_apache2.c:1.120 --- php-src/sapi/apache2filter/sapi_apache2.c:1.119 Sun Aug 3 15:31:56 2003 +++ php-src/sapi/apache2filter/sapi_apache2.c Fri Dec 12 12:19:11 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.119 2003/08/03 19:31:56 thetaphi Exp $ */ +/* $Id: sapi_apache2.c,v 1.120 2003/12/12 17:19:11 iliaa Exp $ */ #include <fcntl.h> @@ -398,7 +398,6 @@ 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);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php