cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c

dmitry Thu Nov 1 14:10:20 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/soap soap.c Log: Fixed bug #42773 (WSDL error causes HTTP 500 Response) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.993&r2=1.2027.2.547.2.994&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.993 php-src/NEWS:1.2027.2.547.2.994 --- php-src/NEWS:1.2027.2.547.2.993 Wed Oct 31 13:23:05 2007 +++ php-src/NEWS Thu Nov 1 14:10:18 2007 @@ -4,6 +4,7 @@ - Added ability to control memory consumption between request using ZEND_MM_COMPACT environment variable. (Dmitry) - Fixed bug #43137 (rmdir() and rename() do not clear statcache). (Jani) +- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry) 18 Oct 2007, PHP 5.2.5RC1 - Upgraded PCRE to version 7.3 (Nuno) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30&r2=1.156.2.28.2.31&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30 php-src/ext/soap/soap.c:1.156.2.28.2.31 --- php-src/ext/soap/soap.c:1.156.2.28.2.30 Wed Sep 5 11:20:45 2007 +++ php-src/ext/soap/soap.c Thu Nov 1 14:10:19 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.156.2.28.2.30 2007/09/05 11:20:45 dmitry Exp $ */ +/* $Id: soap.c,v 1.156.2.28.2.31 2007/11/01 14:10:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2039,13 +2039,14 @@ static void soap_error_handler(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args) { - zend_bool _old_in_compilation, _old_in_execution; + zend_bool _old_in_compilation, _old_in_execution, _old_headers_sent; zend_execute_data *_old_current_execute_data; TSRMLS_FETCH(); _old_in_compilation = CG(in_compilation); _old_in_execution = EG(in_execution); _old_current_execute_data = EG(current_execute_data); + _old_headers_sent = SG(headers_sent); if (!SOAP_GLOBAL(use_soap_error_handler)) { call_old_error_handler(error_num, error_filename, error_lineno, format, args); @@ -2103,12 +2104,14 @@ old_objects = EG(objects_store).object_buckets; EG(objects_store).object_buckets = NULL; PG(display_errors) = 0; + SG(headers_sent) = 1; zend_try { call_old_error_handler(error_num, error_filename, error_lineno, format, args); } zend_catch { CG(in_compilation) = _old_in_compilation; EG(in_execution) = _old_in_execution; EG(current_execute_data) = _old_current_execute_data; + SG(headers_sent) = _old_headers_sent; } zend_end_try(); EG(objects_store).object_buckets = old_objects; PG(display_errors) = old; @@ -2181,12 +2184,14 @@ } PG(display_errors) = 0; + SG(headers_sent) = 1; zend_try { call_old_error_handler(error_num, error_filename, error_lineno, format, args); } zend_catch { CG(in_compilation) = _old_in_compilation; EG(in_execution) = _old_in_execution; EG(current_execute_data) = _old_current_execute_data; + SG(headers_sent) = _old_headers_sent; } zend_end_try(); PG(display_errors) = old;