summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2018-07-28 22:16:29 -0700
committerStanislav Malyshev <stas@php.net>2018-09-09 11:45:14 -0700
commit23b057742e3cf199612fa8050ae86cae675e214e (patch)
tree7316223faa0825973c6a8e3f66225d7b92f39872
parent1ba3314335b8bb7c86c24443588d5ef9c55d4a44 (diff)
downloadphp-git-23b057742e3cf199612fa8050ae86cae675e214e.tar.gz
Fix for bug #76582
The brigade seems to end up in a messed up state if something fails in shutdown, so we clean it up.
-rw-r--r--sapi/apache2handler/sapi_apache2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 6fa2521c38..0ebca9bca8 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -678,6 +678,7 @@ zend_first_try {
if (!parent_req) {
php_apache_request_dtor(r TSRMLS_CC);
ctx->request_processed = 1;
+ apr_brigade_cleanup(brigade);
bucket = apr_bucket_eos_create(r->connection->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(brigade, bucket);