summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Orton <jorton@php.net>2004-10-21 19:43:37 +0000
committerJoe Orton <jorton@php.net>2004-10-21 19:43:37 +0000
commitbcb3eb98a8b41ff23f5cc26959d0b1773be28c71 (patch)
tree0744acc2d475b1c5aa2257684b8c59a15c333294
parent3b3ef4c5eeb091a29431561176d0db8e5d6910ca (diff)
downloadphp-git-bcb3eb98a8b41ff23f5cc26959d0b1773be28c71.tar.gz
MFH: Fix case where php_handle_aborted_connection was called
outside a try/end_try block (#25570).
-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 0bf67b6555..8035212a51 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -562,7 +562,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 {