]> granicus.if.org Git - php/commitdiff
Revert fix for nicer truncation on log_errors_max_len
authorBob Weinand <bobwei9@hotmail.com>
Tue, 18 Aug 2015 11:59:37 +0000 (13:59 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Tue, 18 Aug 2015 12:01:18 +0000 (14:01 +0200)
Zend/zend_exceptions.c

index 3af0b5ac075f83b6f66b9deab24984830408259f..ab0fc73c8140c0ab6174c3b84cfb60db327c80e3 100644 (file)
@@ -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);