cvs: php-src(PHP_4_4) /main php_variables.c /tests/basic 027.phpt
| From: | Jani Taskinen | Date: | Sun, 03 Jun 2007 16:54:46 +0000 |
| Subject: | cvs: php-src(PHP_4_4) /main php_variables.c /tests/basic 027.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44594@lists.php.net to get a copy of this message | ||
sniper Sun Jun 3 16:54:46 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/main php_variables.c
/php-src/tests/basic 027.phpt
Log:
MFH:- Improved the error message for exceeding max_input_nesting_level.
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.45.2.13.2.12&r2=1.45.2.13.2.13&diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.45.2.13.2.12 php-src/main/php_variables.c:1.45.2.13.2.13
--- php-src/main/php_variables.c:1.45.2.13.2.12 Sun Jun 3 16:29:24 2007
+++ php-src/main/php_variables.c Sun Jun 3 16:54:46 2007
@@ -16,7 +16,7 @@
| Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.c,v 1.45.2.13.2.12 2007/06/03 16:29:24 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.45.2.13.2.13 2007/06/03 16:54:46 sniper Exp $ */
#include <stdio.h>
#include "php.h"
@@ -143,7 +143,7 @@
zval_dtor(val);
if (!PG(display_errors)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level more than
allowed %ld (change max_input_nesting_level in php.ini to increase the limit)",
PG(max_input_nesting_level));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded %ld.
To increase the limit change max_input_nesting_level in php.ini.",
PG(max_input_nesting_level));
}
return;
}
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/tests/basic/027.phpt
diff -u php-src/tests/basic/027.phpt:1.2.2.2 php-src/tests/basic/027.phpt:1.2.2.3
--- php-src/tests/basic/027.phpt:1.2.2.2 Sun Jun 3 16:29:24 2007
+++ php-src/tests/basic/027.phpt Sun Jun 3 16:54:46 2007
@@ -32,4 +32,4 @@
}
}
}
-string(124) "Unknown: Input variable nesting level more than allowed 10 (change
max_input_nesting_level in php.ini to increase the limit)"
+string(124) "Unknown: Input variable nesting level exceeded 10. To increase the level change
max_input_nesting_level in php.ini."