svn: /php/php-src/ branches/PHP_5_2/run-tests.php branches/PHP_5_3/run-tests.php trunk/run-tests.php
| From: | Kalle Sommer Nielsen | Date: | Mon, 16 Aug 2010 20:56:00 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/run-tests.php branches/PHP_5_3/run-tests.php trunk/run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63303@lists.php.net to get a copy of this message | ||
kalle Mon, 16 Aug 2010 20:56:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302373
Log:
Fixed bug #50836 (run_tests.php alerts syntax errors while testing session)
Bug: http://bugs.php.net/50836 (Assigned) run_tests.php
alerts syntax errors while testing session
Changed paths:
U php/php-src/branches/PHP_5_2/run-tests.php
U php/php-src/branches/PHP_5_3/run-tests.php
U php/php-src/trunk/run-tests.php
Modified: php/php-src/branches/PHP_5_2/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_2/run-tests.php 2010-08-16 19:41:48 UTC (rev 302372)
+++ php/php-src/branches/PHP_5_2/run-tests.php 2010-08-16 20:56:00 UTC (rev 302373)
@@ -2161,7 +2161,17 @@
$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\"";
}
}
Modified: php/php-src/branches/PHP_5_3/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_3/run-tests.php 2010-08-16 19:41:48 UTC (rev 302372)
+++ php/php-src/branches/PHP_5_3/run-tests.php 2010-08-16 20:56:00 UTC (rev 302373)
@@ -2161,7 +2161,17 @@
$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\"";
}
}
Modified: php/php-src/trunk/run-tests.php
===================================================================
--- php/php-src/trunk/run-tests.php 2010-08-16 19:41:48 UTC (rev 302372)
+++ php/php-src/trunk/run-tests.php 2010-08-16 20:56:00 UTC (rev 302373)
@@ -2161,7 +2161,17 @@
$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\"";
}
}