1
0
mirror of https://github.com/php/php-src.git synced 2026-04-15 03:51:07 +02:00

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

This commit is contained in:
Stanislav Malyshev
2015-04-04 15:03:46 -07:00
parent 80e2632776
commit af1cd45d17
2 changed files with 5 additions and 0 deletions

4
NEWS
View File

@@ -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))

View File

@@ -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;
}