cellog Sat Jan 5 21:39:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/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.226.2.37.2.35.2.11&r2=1.226.2.37.2.35.2.12&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.11
php-src/run-tests.php:1.226.2.37.2.35.2.12
--- php-src/run-tests.php:1.226.2.37.2.35.2.11 Sat Jan 5 21:05:06 2008
+++ php-src/run-tests.php Sat Jan 5 21:39:53 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.11 2008/01/05 21:05:06 cellog Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.12 2008/01/05 21:39:53 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
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.11
$'."\n";
+ echo '$Revision: 1.226.2.37.2.35.2.12
$'."\n";
exit(1);
case 'u':
@@ -1600,7 +1600,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;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
