Fix case where php_handle_aborted_connection was called outside a

try/end_try block (#25570).

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index b2cde707ab383642f11b9e2ea9cfb262f26b045a..66583b3edf9c81adb837a36804a6de841a68f4e1 100644 (file)
--- 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 {