cvs: php-src / run-tests.php
| From: | Greg Beaver | Date: | Sat, 05 Jan 2008 21:39:39 +0000 |
| Subject: | cvs: php-src / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47718@lists.php.net to get a copy of this message | ||
cellog Sat Jan 5 21:39:39 2008 UTC
Modified files:
/php-src run-tests.php
Log:
remove potential preg warnings if --EXPECTHEADERS-- is combined with --EXPECTF-- or --EXPECTRE--
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.338&r2=1.339&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.338 php-src/run-tests.php:1.339
--- php-src/run-tests.php:1.338 Sat Jan 5 21:04:55 2008
+++ php-src/run-tests.php Sat Jan 5 21:39:39 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.338 2008/01/05 21:04:55 cellog Exp $ */
+/* $Id: run-tests.php,v 1.339 2008/01/05 21:39:39 cellog Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is available.
* In the event it is not, print a nice error message indicating that this script will
@@ -415,7 +415,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.338 $'."\n";
+ echo '$Revision: 1.339 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -1667,7 +1667,7 @@
$wanted = $wanted_headers . "\n--HEADERS--\n" . $wanted;
$output = $output_headers . "\n--HEADERS--\n" . $output;
if (isset($wanted_re)) {
- $wanted_re = $wanted_headers . "\n--HEADERS--\n" . $wanted_re;
+ $wanted_re = preg_quote($wanted_headers . "\n--HEADERS--\n", '/') .
$wanted_re;
}
}