jorton Wed Oct 20 05:28:47 2004 EDT
Modified files:
/php-src/sapi/apache2handler sapi_apache2.c
Log:
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.44&r2=1.45&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.44
php-src/sapi/apache2handler/sapi_apache2.c:1.45
--- php-src/sapi/apache2handler/sapi_apache2.c:1.44 Wed Aug 11 16:51:41 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Oct 20 05:28:47 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.44 2004/08/11 20:51:41 helly Exp $ */
+/* $Id: sapi_apache2.c,v 1.45 2004/10/20 09:28:47 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -567,7 +567,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
