iliaa Fri Dec 12 12:19:19 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
/php-src/sapi/apache2filter sapi_apache2.c
Log:
MFH: Fixed bug #26604 (Apache2 SAPIs implicitly disable Keep-Alive). (Ilia)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.499 php-src/NEWS:1.1247.2.500
--- php-src/NEWS:1.1247.2.499 Fri Dec 12 00:20:24 2003
+++ php-src/NEWS Fri Dec 12 12:19:16 2003
@@ -7,6 +7,7 @@
(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)
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.23
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.24
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.23 Wed Oct 1 23:24:43 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Dec 12 12:19:17 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.23 2003/10/02 03:24:43 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.24 2003/12/12 17:19:17 iliaa Exp $ */
#include <fcntl.h>
@@ -432,7 +432,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.91.2.20
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.21
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.20 Sun Aug 3 15:31:13 2003
+++ php-src/sapi/apache2filter/sapi_apache2.c Fri Dec 12 12:19:18 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.91.2.20 2003/08/03 19:31:13 thetaphi Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.21 2003/12/12 17:19:18 iliaa Exp $ */
#include <fcntl.h>
@@ -397,7 +397,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
