diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-04 15:03:46 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-04 15:09:34 -0700 |
| commit | af1cd45d171fbb06712f846cec7bf69438db8ec2 (patch) | |
| tree | 3caffe4028abf2fb044bc72d877d2978db533e77 | |
| parent | 80e263277600b5e62acfc993a308b8174f70581e (diff) | |
| download | php-git-af1cd45d171fbb06712f846cec7bf69438db8ec2.tar.gz | |
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -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; } |