dmitry Mon Sep 12 03:13:57 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard var.c
Log:
Better fix for exceptions in __sleep()
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.203.2.1&r2=1.203.2.2&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.1
php-src/ext/standard/var.c:1.203.2.2
--- php-src/ext/standard/var.c:1.203.2.1 Sat Sep 10 13:47:20 2005
+++ php-src/ext/standard/var.c Mon Sep 12 03:13:54 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.203.2.1 2005/09/10 17:47:20 wez Exp $ */
+/* $Id: var.c,v 1.203.2.2 2005/09/12 07:13:54 dmitry Exp $ */
@@ -717,14 +717,7 @@
res =
call_user_function_ex(CG(function_table), struc, &fname,
&retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
- if (res == SUCCESS) {
- if (EG(exception)) {
- /* allow exceptions to
bubble up */
- if (retval_ptr) {
-
zval_ptr_dtor(&retval_ptr);
- }
- return;
- }
+ if (res == SUCCESS && !EG(exception)) {
if (retval_ptr) {
if
(HASH_OF(retval_ptr)) {
php_var_serialize_class(buf, struc, retval_ptr,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
