]> granicus.if.org Git - php/commitdiff
Fix for bug #76582
authorStanislav Malyshev <stas@php.net>
Sun, 29 Jul 2018 05:16:29 +0000 (22:16 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 9 Sep 2018 18:45:14 +0000 (11:45 -0700)
The brigade seems to end up in a messed up state if something fails
in shutdown, so we clean it up.

sapi/apache2handler/sapi_apache2.c

index 6fa2521c3847a10c32428d2de92f1a20b5190b94..0ebca9bca863909aef3fd3417bb3baad1605df34 100644 (file)
@@ -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);