dmitry Wed Aug 1 10:39:33 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugs bug42151.phpt
Modified files:
/php-src NEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #42151 (__destruct functions not called after catching a SoapFault
exception)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.869&r2=1.2027.2.547.2.870&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.869 php-src/NEWS:1.2027.2.547.2.870
--- php-src/NEWS:1.2027.2.547.2.869 Tue Jul 31 22:48:42 2007
+++ php-src/NEWS Wed Aug 1 10:39:32 2007
@@ -70,6 +70,8 @@
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
+- Fixed bug #42151 (__destruct functions not called after catching a SoapFault
+ exception). (Dmitry)
- Fixed bug #42142 (substr_replace() returns FALSE when length > string
length). (Ilia)
- Fixed bug #42135 (Second call of session_start() causes creation of SID).
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.26&r2=1.156.2.28.2.27&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.26
php-src/ext/soap/soap.c:1.156.2.28.2.27
--- php-src/ext/soap/soap.c:1.156.2.28.2.26 Fri Jul 13 14:00:05 2007
+++ php-src/ext/soap/soap.c Wed Aug 1 10:39:33 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.26 2007/07/13 14:00:05 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.27 2007/08/01 10:39:33 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2067,6 +2067,7 @@
#ifdef va_copy
va_list argcopy;
#endif
+ zend_object_store_bucket *old_objects;
int old = PG(display_errors);
INIT_ZVAL(outbuf);
@@ -2093,6 +2094,8 @@
INIT_PZVAL(exception);
zend_throw_exception_object(exception TSRMLS_CC);
+ old_objects = EG(objects_store).object_buckets;
+ EG(objects_store).object_buckets = NULL;
PG(display_errors) = 0;
zend_try {
call_old_error_handler(error_num,
error_filename, error_lineno, format, args);
@@ -2101,6 +2104,7 @@
EG(in_execution) = _old_in_execution;
EG(current_execute_data) =
_old_current_execute_data;
} zend_end_try();
+ EG(objects_store).object_buckets = old_objects;
PG(display_errors) = old;
zend_bailout();
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug42151.phpt
+++ php-src/ext/soap/tests/bugs/bug42151.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
