From 809610f5ea38a83b284e1125d1fff129bdd615e7 Mon Sep 17 00:00:00 2001

From: Stanislav Malyshev <stas@php.net>

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 e97f11c..cfebc5f 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;

 	}

-- 

2.1.4