iliaa Thu Nov 17 15:56:09 2005 EDT
Modified files:
/php-src/sapi/apache2handler sapi_apache2.c
Log:
Hopefully resolve all the Apache 2 sub-request problems on non-linux systems.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.62&r2=1.63&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.62
php-src/sapi/apache2handler/sapi_apache2.c:1.63
--- php-src/sapi/apache2handler/sapi_apache2.c:1.62 Wed Oct 26 11:08:42 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 17 15:56:09 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.62 2005/10/26 15:08:42 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.63 2005/11/17 20:56:09 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -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, &php5_module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
