summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/sapi_apache2.c
diff options
context:
space:
mode:
authorJoe Orton <jorton@php.net>2004-10-21 08:22:58 +0000
committerJoe Orton <jorton@php.net>2004-10-21 08:22:58 +0000
commit88c5b7569809538c3fa25856f0a7a02316a86660 (patch)
tree14c76d94dadea428729228f01e930d8d6571dd90 /sapi/apache2handler/sapi_apache2.c
parentc6e0f60774a62c97f4f461ea8e78ef47c9dd560a (diff)
downloadphp-git-88c5b7569809538c3fa25856f0a7a02316a86660.tar.gz
MFH: Fix case where php_handle_aborted_connection was called
outside a try/end_try block (#25570).
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
-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 f5b133bcc1..de3232c3eb 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -557,7 +557,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 {