From 01883bcffb682f34309f9fbf112eecb050559522 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sat, 4 Apr 2015 15:03:46 -0700 Subject: [PATCH] Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) --- sapi/apache2handler/sapi_apache2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 088ff77769..840c55041d 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -688,6 +688,7 @@ zend_first_try { } zend_end_try(); } apr_brigade_cleanup(brigade); + apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup); } else { ctx->r = parent_req; }