shane Sun Oct 27 20:43:54 2002 EDT
Modified files:
/php4 run-tests.php
Log:
fix getting ini values that contain the char =
fix command line quoting. windows requires double quotes in order to handle & (in
ini values) correctly
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.92 php4/run-tests.php:1.93
--- php4/run-tests.php:1.92 Sun Oct 27 19:07:11 2002
+++ php4/run-tests.php Sun Oct 27 20:43:54 2002
@@ -272,8 +272,7 @@
/* We got failed Tests, offer the user to send and e-mail to QA team, unless
NO_INTERACTION is set */
if ($sum_results['FAILED'] && !getenv('NO_INTERACTION')) {
$fp = fopen("php://stdin", "r+");
- fwrite($fp, "Some tests have failed, would you like to send the\nreport to
PHP's QA team? [Yn]: ");
- fflush($fp);
+ echo "Some tests have failed, would you like to send the\nreport to PHP's QA
+team? [Yn]: ";
$user_input = fgets($fp, 10);
if (strlen(trim($user_input)) == 0 || strtolower($user_input[0]) == 'y') {
@@ -509,17 +508,17 @@
if (array_key_exists('INI', $section_text)) {
foreach(preg_split( "/[\n\r]+/", $section_text['INI']) as $setting) {
if (strpos($setting, '=')!==false) {
- $setting = explode("=", $setting);
+ $setting = explode("=", $setting,2);
$name = trim(strtolower($setting[0]));
$value = trim($setting[1]);
- $ini_settings[$name] = $value;
+ $ini_settings[$name] = addslashes($value);
}
}
}
if (count($ini_settings)) {
$settings = '';
foreach($ini_settings as $name => $value) {
- $settings .= " -d '$name=$value'";
+ $settings .= " -d \"$name=$value\"";
}
$ini_settings = $settings;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
