Fix case where php_handle_aborted_connection was called outside a

Joe Orton · Joe Orton · commit 1ef6c7add145 · 2004-10-20T09:28:47.000Z
try/end_try block (#25570).
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,9 @@ zend_first_try {`
`567`	`567`
`568`	`568`	`rv = ap_pass_brigade(r->output_filters, brigade);`
`569`	`569`	`if (rv != APR_SUCCESS \|\| r->connection->aborted) {`
	`570`	`+zend_first_try {`
`570`	`571`	`php_handle_aborted_connection();`
	`572`	`+} zend_end_try();`
`571`	`573`	`}`
`572`	`574`	`apr_brigade_cleanup(brigade);`
`573`	`575`	`} else {`