Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index e97f11c69bdaaa2971a6dfd84ad5e43f261af899..cfebc5f5c65f07649a49dc7034353839ae3b82e6 100644 (file)
--- 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;
        }