dmitry Wed May 24 13:28:59 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src run-tests.php
Log:
Fixed CGI tests.
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.37.2.3&r2=1.226.2.37.2.4&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.3
php-src/run-tests.php:1.226.2.37.2.4
--- php-src/run-tests.php:1.226.2.37.2.3 Tue May 16 23:05:49 2006
+++ php-src/run-tests.php Wed May 24 13:28:59 2006
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.3 2006/05/16 23:05:49 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.4 2006/05/24 13:28:59 dmitry 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
@@ -397,7 +397,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.3 $'."\n";
+ echo '$Revision: 1.226.2.37.2.4 $'."\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -1384,7 +1384,7 @@
/* when using CGI, strip the headers from the output */
$headers = "";
if (isset($old_php) && preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $out,
$match)) {
- $output = $match[2];
+ $output = trim($match[2]);
$rh = preg_split("/[\n\r]+/",$match[1]);
$headers = array();
foreach ($rh as $line) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
