jorton Thu Oct 21 04:22:59 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFH: Fix case where php_handle_aborted_connection was called
outside a try/end_try block (#25570).
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.1&r2=1.40.2.2&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.1
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.2
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.1 Sat Jul 17 17:31:43 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Oct 21 04:22:58 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.1 2004/07/17 21:31:43 moriyoshi Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.2 2004/10/21 08:22:58 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -557,7 +557,9 @@
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 {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
