From: Nuno Lopes <nlopess@php.net>
Date: Mon, 28 May 2012 00:14:31 +0000 (-0400)
Subject: sync with HEAD
X-Git-Tag: php-5.4.4RC2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=339508d6ace868b022cd59f20630e3218e52732a;p=php

sync with HEAD
---

diff --git a/run-tests.php b/run-tests.php
index 1fe0deb6af..2b37ec4f4a 100755
--- 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)