sniper Fri Mar 18 16:59:07 2005 EDT
Modified files:
/php-src run-tests.php
Log:
Fix errors with -d having a check for invalid ini entries
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.204&r2=1.205&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.204 php-src/run-tests.php:1.205
--- php-src/run-tests.php:1.204 Tue Mar 8 23:23:02 2005
+++ php-src/run-tests.php Fri Mar 18 16:59:06 2005
@@ -163,7 +163,6 @@
save_text($info_file, $php_info);
$ini_overwrites = array(
'output_handler=',
- 'zlib.output_compression=Off',
'open_basedir=',
'safe_mode=0',
'disable_functions=',
@@ -182,9 +181,19 @@
'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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
