diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-09-09 12:29:29 -0700 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2018-09-10 15:26:39 +0200 |
| commit | 3b07b3c203a2bd5531b83e623973414030405e84 (patch) | |
| tree | fb9c1bbaf7244f033947f18d9b29058175266514 | |
| parent | b15f24b045c708266452906fa7a734094f40f343 (diff) | |
| download | php-git-3b07b3c203a2bd5531b83e623973414030405e84.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fix for bug #76582
| -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); |