com php-src: Revert fix for nicer truncation on log_errors_ max_len: Zend/zend_exceptions.c
| From: | Bob Weinand | Date: | Tue, 18 Aug 2015 12:01:18 +0000 |
| Subject: | com php-src: Revert fix for nicer truncation on log_errors_ max_len: Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88584@lists.php.net to get a copy of this message | ||
Commit: 501407aa49e4c664381b9849b8385d6ab390b18d
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 18 Aug 2015 13:59:37 +0200
Parents: 1b5e87a579080da1452e173981b7d8a6814f15c0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=501407aa49e4c664381b9849b8385d6ab390b18d
Log:
Revert fix for nicer truncation on log_errors_max_len
Changed paths:
M Zend/zend_exceptions.c
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 3af0b5a..ab0fc73 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -1037,7 +1037,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */
line = zval_get_long(GET_PROPERTY_SILENT(&exception, "line"));
zend_error_va(severity, (file && ZSTR_LEN(file) > 0) ? ZSTR_VAL(file) : NULL, line,
- "Uncaught %.*s\n thrown", PG(log_errors_max_len) ? MIN(ZSTR_LEN(str),
MAX(PG(log_errors_max_len) - 18, 0)) : ZSTR_LEN(str), ZSTR_VAL(str));
+ "Uncaught %s\n thrown", ZSTR_VAL(str));
zend_string_release(str);
zend_string_release(file);