iliaa Thu Nov 17 16:01:15 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.40.2.6&r2=1.1.2.40.2.7&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.6
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.7
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.6 Wed Nov 2
12:55:17 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 17 16:01:13 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40.2.6 2005/11/02 17:55:17 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.7 2005/11/17 21:01:13 iliaa Exp $ */
#include <fcntl.h>
@@ -457,6 +457,7 @@
if (strcmp(r->protocol, "INCLUDED")) { \
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context),
php_server_context_cleanup); \
conf = ap_get_module_config(r->per_dir_config, &php4_module);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.79&r2=1.1247.2.920.2.80&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.79 php-src/NEWS:1.1247.2.920.2.80
--- php-src/NEWS:1.1247.2.920.2.79 Thu Nov 17 09:21:09 2005
+++ php-src/NEWS Thu Nov 17 16:01:13 2005
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, Version 4.4.2
+- Resolve Apache 2 regression with sub-request handling on non-linux systems.
+ (Ilia, Tony)
- Backport missing imap_mailcompose fixes from 5.X. (Ilia)
- Added missing safe_mode/open_basedir checks in cURL extension. (Ilia)
- Fixed bug #35257 (Calling ob_flush after creating an ob callback causes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
