sync with HEAD

diff --git a/run-tests.php b/run-tests.php
index 1fe0deb6afcda1218d3533d12adfc04eed2a0523..2b37ec4f4af69cfdf0f2fc9e4702eb1ff3c0a9b0 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -239,10 +239,7 @@ $ini_overwrites = array(
                'magic_quotes_runtime=0',
                'ignore_repeated_errors=0',
                'precision=14',
-               'unicode.runtime_encoding=ISO-8859-1',
-               'unicode.script_encoding=UTF-8',
-               'unicode.output_encoding=UTF-8',
-               'unicode.from_error_mode=U_INVALID_SUBSTITUTE',
+               'memory_limit=128M',
        );
 
 function write_information($show_html)