From af1cd45d171fbb06712f846cec7bf69438db8ec2 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)

---
 NEWS                               | 4 ++++
 sapi/apache2handler/sapi_apache2.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index 9c8e0ec5b6..75aa306948 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2015 PHP 5.4.40
 
+- Apache2 Handler SAPI:
+  . Fixed bug #69218 (potential remote code execution with apache 2.4
+    apache2handler). (Patrick Schaaf)
+
 - Fileinfo:
   . Fixed bug #68819 (Fileinfo on specific file causes spurious OOM and/or 
     segfault). (Anatol Belski))
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index e97f11c69b..cfebc5f5c6 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.40.0