diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-09-09 12:29:23 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-09-09 12:29:23 -0700 |
| commit | 6623f3caca75398c930d0cece25eeff0efe95a7e (patch) | |
| tree | 478550421b139a07b709e3da08cc5c0fc902df53 | |
| parent | be50a72715c141befe6f34ece660745da894aaf3 (diff) | |
| parent | 024f3ac160228c9a7ace342b757cbd07934fa189 (diff) | |
| download | php-git-6623f3caca75398c930d0cece25eeff0efe95a7e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 e7edcab6da..2c3356b5c1 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -723,6 +723,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); |