From: Joe Orton <jorton@php.net>
Date: Thu, 21 Oct 2004 08:22:58 +0000 (+0000)
Subject: MFH: Fix case where php_handle_aborted_connection was called
X-Git-Tag: php-5.0.3RC1~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88c5b7569809538c3fa25856f0a7a02316a86660;p=php

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