From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 17 Nov 2005 20:56:09 +0000 (+0000)
Subject: Hopefully resolve all the Apache 2 sub-request problems on non-linux systems.
X-Git-Tag: RELEASE_0_9_3~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb94f372cb756cae1ed5915c441c0e1a9a91da37;p=php

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 c2952c4255..d74ff58730 100644
--- 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);