From: Joe Orton <jorton@php.net>
Date: Wed, 20 Oct 2004 09:28:47 +0000 (+0000)
Subject: Fix case where php_handle_aborted_connection was called outside a
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ef6c7add145d5f0d9ed787fc5aa1dca57db5057;p=php

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 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 {