]> granicus.if.org Git - php/commitdiff
Fixed bug #50836 (run_tests.php alerts syntax errors while testing session)
authorKalle Sommer Nielsen <kalle@php.net>
Mon, 16 Aug 2010 20:56:00 +0000 (20:56 +0000)
committerKalle Sommer Nielsen <kalle@php.net>
Mon, 16 Aug 2010 20:56:00 +0000 (20:56 +0000)
run-tests.php

index 8d62de71637d5de2b8239fa9324fa763203d8c0a..cdcd674ed81bca7913a339cc5e8204c524034467 100755 (executable)
@@ -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\"";
                }
        }