helly Thu May 11 08:06:23 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/spl spl_array.c
Log:
- Use of E_RECOVERABLE_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3&r2=1.91.2.3.2.1&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3
php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.1
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3 Sun Jan 1 12:50:08 2006
+++ php-src/ext/mcrypt/mcrypt.c Thu May 11 08:06:22 2006
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.91.2.3 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.1 2006/05/11 08:06:22 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1097,7 +1097,8 @@
}
if (mcrypt_generic_init(td, key_s, use_key_length, iv_s) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Mcrypt
initialisation failed");
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Mcrypt
initialisation failed");
+ RETURN_FALSE;
}
if (dencrypt == MCRYPT_ENCRYPT) {
mcrypt_generic(td, data_s, data_size);
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.1&r2=1.71.2.17.2.2&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.1
php-src/ext/spl/spl_array.c:1.71.2.17.2.2
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.1 Wed May 10 00:03:38 2006
+++ php-src/ext/spl/spl_array.c Thu May 11 08:06:22 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.1 2006/05/10 00:03:38 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.2 2006/05/11 08:06:22 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -522,7 +522,7 @@
}
if (Z_TYPE_P(intern->array) == IS_OBJECT) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot append
properties to objects, use %s::offsetSet() instead", Z_OBJCE_P(object)->name);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Cannot
append properties to objects, use %s::offsetSet() instead",
Z_OBJCE_P(object)->name);
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
