diff options
author | Stanislav Malyshev <stas@php.net> | 2018-09-09 12:29:29 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2018-09-09 12:29:29 -0700 |
commit | 788717d56d48f6697829d95cf9b9a49a35d53058 (patch) | |
tree | a058466f08ff210f70d415cb32c15ea9abbb000e /sapi/apache2handler/sapi_apache2.c | |
parent | 87a9536bdaba91adbaacc22898015045b1df8513 (diff) | |
parent | 6623f3caca75398c930d0cece25eeff0efe95a7e (diff) | |
download | php-git-788717d56d48f6697829d95cf9b9a49a35d53058.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fix for bug #76582
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
-rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index a4ee0cdcf6..34fe9585d2 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -712,6 +712,7 @@ zend_first_try { if (!parent_req) { php_apache_request_dtor(r); ctx->request_processed = 1; + apr_brigade_cleanup(brigade); bucket = apr_bucket_eos_create(r->connection->bucket_alloc); APR_BRIGADE_INSERT_TAIL(brigade, bucket); |