1 commit af1cd45d171fbb06712f846cec7bf69438db8ec2
2 Author: Stanislav Malyshev <stas@php.net>
3 Date: Sat Apr 4 15:03:46 2015 -0700
5 Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
7 diff --git a/NEWS b/NEWS
8 index 9c8e0ec..75aa306 100644
11 @@ -2,6 +2,10 @@ PHP NEWS
12 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
13 ?? ??? 2015 PHP 5.4.40
15 +- Apache2 Handler SAPI:
16 + . Fixed bug #69218 (potential remote code execution with apache 2.4
17 + apache2handler). (Patrick Schaaf)
20 . Fixed bug #68819 (Fileinfo on specific file causes spurious OOM and/or
21 segfault). (Anatol Belski))
22 diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
23 index e97f11c..cfebc5f 100644
24 --- a/sapi/apache2handler/sapi_apache2.c
25 +++ b/sapi/apache2handler/sapi_apache2.c
26 @@ -688,6 +688,7 @@ zend_first_try {
29 apr_brigade_cleanup(brigade);
30 + apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup);