com php-src: Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4): NEWS sapi/apache2handler/sapi_apache2.c

Commit: af1cd45d171fbb06712f846cec7bf69438db8ec2 Author: Stanislav Malyshev <stas@php.net> Sat, 4 Apr 2015 15:03:46 -0700 Parents: 80e263277600b5e62acfc993a308b8174f70581e Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af1cd45d171fbb06712f846cec7bf69438db8ec2 Log: Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Bugs: https://bugs.php.net/68486 https://bugs.php.net/69218 Changed paths: M NEWS M sapi/apache2handler/sapi_apache2.c Diff: diff --git a/NEWS b/NEWS index 9c8e0ec..75aa306 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 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; }