]> granicus.if.org Git - php/commitdiff
revert
authorfoobar <sniper@php.net>
Fri, 18 Mar 2005 22:09:31 +0000 (22:09 +0000)
committerfoobar <sniper@php.net>
Fri, 18 Mar 2005 22:09:31 +0000 (22:09 +0000)
run-tests.php

index 7c1a9a671830bac25be55d13cc4eeed9610b30dc..80b72712c0ff33511bce4d905bcc7cce725f6ef5 100755 (executable)
@@ -163,6 +163,7 @@ More .INIs  : " . (function_exists(\'php_ini_scanned_files\') ? str_replace("\n"
 save_text($info_file, $php_info);
 $ini_overwrites = array(
                'output_handler=',
+               'zlib.output_compression=Off',
                'open_basedir=',
                'safe_mode=0',
                'disable_functions=',
@@ -181,19 +182,9 @@ $ini_overwrites = array(
                'auto_prepend_file=',
                'auto_append_file=',
                'magic_quotes_runtime=0',
+               'xdebug.default_enable=0',
+               'session.auto_start=0'
        );
-
-/* Only add overwrites if the extension is loaded */ 
-if (extension_loaded('xdebug')) {
-       $ini_overwrites[] = 'xdebug.default_enable=0';
-}
-if (extension_loaded('zlib')) {
-       $ini_overwrites[] =     'zlib.output_compression=Off';
-}
-if (extension_loaded('session')) {
-       $ini_overwrites[] = 'session.auto_start=0';
-}
-
 $info_params = array();
 settings2array($ini_overwrites,$info_params);
 settings2params($info_params);