MFH: 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 f5b133bcc1bf475b603bb6f248762ea097a02c4d..de3232c3ebc55d8ddcefc1eee4bb9e74d147dfef 100644 (file)
--- 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 {