projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| c503ed1d AM |
1 | commit af1cd45d171fbb06712f846cec7bf69438db8ec2 |
| 2 | Author: Stanislav Malyshev <stas@php.net> | |
| 3 | Date: Sat Apr 4 15:03:46 2015 -0700 | |
| 4 | ||
| 5 | Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) | |
| 6 | ||
| 7 | diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c | |
| 8 | index e97f11c..cfebc5f 100644 | |
| 9 | --- a/sapi/apache2handler/sapi_apache2.c | |
| 10 | +++ b/sapi/apache2handler/sapi_apache2.c | |
| 11 | @@ -688,6 +688,7 @@ zend_first_try { | |
| 12 | } zend_end_try(); | |
| 13 | } | |
| 14 | apr_brigade_cleanup(brigade); | |
| 15 | + apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup); | |
| 16 | } else { | |
| 17 | ctx->r = parent_req; | |
| 18 | } |