summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
diff options
context:
space:
mode:
authorJoe Orton <jorton@php.net>2004-10-20 09:28:47 +0000
committerJoe Orton <jorton@php.net>2004-10-20 09:28:47 +0000
commit1ef6c7add145d5f0d9ed787fc5aa1dca57db5057 (patch)
treedaa415e610139bfab4b88bf26e19014ed424a99f /sapi/apache2handler
parented6025327c239b7e1e891d0ac74a90410fb705a8 (diff)
downloadphp-git-1ef6c7add145d5f0d9ed787fc5aa1dca57db5057.tar.gz
Fix case where php_handle_aborted_connection was called outside a
try/end_try block (#25570).
Diffstat (limited to 'sapi/apache2handler')
-rw-r--r--sapi/apache2handler/sapi_apache2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index b2cde707ab..66583b3edf 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -567,7 +567,9 @@ zend_first_try {
rv = ap_pass_brigade(r->output_filters, brigade);
if (rv != APR_SUCCESS || r->connection->aborted) {
+zend_first_try {
php_handle_aborted_connection();
+} zend_end_try();
}
apr_brigade_cleanup(brigade);
} else {