jani Thu Jul 24 21:39:23 2008 UTC Modified files: /php-src run-tests.php Log: - Revert accidental commit. http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.368&r2=1.369&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.368 php-src/run-tests.php:1.369 --- php-src/run-tests.php:1.368 Thu Jul 24 19:50:22 2008 +++ php-src/run-tests.php Thu Jul 24 21:39:23 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.368 2008/07/24 19:50:22 felipe Exp $ */ +/* $Id: run-tests.php,v 1.369 2008/07/24 21:39:23 jani 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 @@ -189,11 +189,7 @@ 'safe_mode=0', 'disable_functions=', 'output_buffering=Off', -<<<<<<< run-tests.php - 'error_reporting=32767', /* E_ALL | E_STRICT */ -======= 'error_reporting=' . (E_ALL | E_STRICT), ->>>>>>> 1.367 'display_errors=1', 'display_startup_errors=1', 'log_errors=0', @@ -482,7 +478,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.368 $' . "\n"; + echo '$Revision: 1.369 $' . "\n"; exit(1); default:
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php