Fixed bug #50836 (run_tests.php alerts syntax errors while testing session)

KalleZ · KalleZ · commit cee97080d1f5 · 2010-08-16T20:56:00.000Z
diff --git a/run-tests.php b/run-tests.php
@@ -2161,7 +2161,17 @@ function settings2params(&$ini_settings)
 				$settings .= " -d \"$name=$val\"";
 			}
 		} else {
-			$value = addslashes($value);
+			if (substr(PHP_OS, 0, 3) == "WIN" && !empty($value) && $value{0} == '"') {
+				$len = strlen($value);
+
+				if ($value{$len - 1} == '"') {
+					$value{0} = "'";
+					$value{$len - 1} = "'";
+				}
+			} else {
+				$value = addslashes($value);
+			}
+
 			$settings .= " -d \"$name=$value\"";
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2161,7 +2161,17 @@ function settings2params(&$ini_settings)`
`2161`	`2161`	`$settings .= " -d \"$name=$val\"";`
`2162`	`2162`	`}`
`2163`	`2163`	`} else {`
`2164`		`- $value = addslashes($value);`
	`2164`	`+ if (substr(PHP_OS, 0, 3) == "WIN" && !empty($value) && $value{0} == '"') {`
	`2165`	`+ $len = strlen($value);`
	`2166`	`+`
	`2167`	`+ if ($value{$len - 1} == '"') {`
	`2168`	`+ $value{0} = "'";`
	`2169`	`+ $value{$len - 1} = "'";`
	`2170`	`+ }`
	`2171`	`+ } else {`
	`2172`	`+ $value = addslashes($value);`
	`2173`	`+ }`
	`2174`	`+`
`2165`	`2175`	`$settings .= " -d \"$name=$value\"";`
`2166`	`2176`	`}`
`2167`	`2177`	`}`