cvs: php-src(PHP_5_2) /ext/wddx wddx.c
| From: | Ilia Alshanetsky | Date: | Tue, 30 May 2006 02:40:33 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/wddx wddx.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38488@lists.php.net to get a copy of this message | ||
iliaa Tue May 30 02:40:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/wddx wddx.c
Log:
Convert E_ERROR to E_RECOVERABLE_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.2&r2=1.119.2.10.2.3&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.2 php-src/ext/wddx/wddx.c:1.119.2.10.2.3
--- php-src/ext/wddx/wddx.c:1.119.2.10.2.2 Thu May 25 22:54:16 2006
+++ php-src/ext/wddx/wddx.c Tue May 30 02:40:33 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.119.2.10.2.2 2006/05/25 22:54:16 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.3 2006/05/30 02:40:33 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -657,7 +657,7 @@
case IS_ARRAY:
ht = Z_ARRVAL_P(var);
if (ht->nApplyCount > 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "WDDX doesn't support circular
references");
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "WDDX doesn't support circular
references");
return;
}
ht->nApplyCount++;
@@ -668,7 +668,7 @@
case IS_OBJECT:
ht = Z_OBJPROP_P(var);
if (ht->nApplyCount > 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "WDDX doesn't support circular
references");
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "WDDX doesn't support circular
references");
return;
}
ht->nApplyCount++;