dmitry Tue Nov 29 06:04:11 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFH: Resolve Apache2 subrequest problems (Ilia)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.13&r2=1.40.2.14&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.13
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.14
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.13 Mon Oct 17
15:35:39 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Tue Nov 29 06:04:11 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.13 2005/10/17 19:35:39 rasmus Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.14 2005/11/29 11:04:11 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -451,6 +451,8 @@
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
+ arp_pool_clenup_run(r->pool, (void*) &SG(server_context),
php_server_context_cleanup);
+
conf = ap_get_module_config(r->per_dir_config, &php5_module);
/* apply_config() needs r in some cases, so allocate server_context
early */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
