dmitry Thu Nov 1 12:26:26 2007 UTC Modified files: (Branch: PHP_5_3) /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.965.2.35&r2=1.2027.2.547.2.965.2.36&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.35 php-src/NEWS:1.2027.2.547.2.965.2.36 --- php-src/NEWS:1.2027.2.547.2.965.2.35 Thu Nov 1 11:12:33 2007 +++ php-src/NEWS Thu Nov 1 12:26:25 2007 @@ -46,6 +46,7 @@ - Fixed possible crash in ext/soap because of uninitialized value (Zdash Urf) - Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry) +- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry) - Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines). (Nuno) - Fixed bug #42657 (ini_get() returns incorrect value when default is NULL). (Jani) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.3&r2=1.156.2.28.2.30.2.4&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.3 php-src/ext/soap/soap.c:1.156.2.28.2.30.2.4 --- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.3 Tue Oct 30 07:21:47 2007 +++ php-src/ext/soap/soap.c Thu Nov 1 12:26:25 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.156.2.28.2.30.2.3 2007/10/30 07:21:47 dmitry Exp $ */ +/* $Id: soap.c,v 1.156.2.28.2.30.2.4 2007/11/01 12:26:25 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2040,13 +2040,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); @@ -2104,12 +2105,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; @@ -2182,12 +2185,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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php