Hopefully resolve all the Apache 2 sub-request problems on non-linux systems.

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index c2952c4255b31b306dfa0423382ccefb9f11765a..d74ff58730bd2848134061d93a0208059cd77d68 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -457,6 +457,7 @@ static int php_handler(request_rec *r)
        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);