pajoye Thu, 22 Apr 2010 11:49:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298313
Log: - Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading Bug: http://bugs.php.net/51629 (Closed) CURLOPT_FOLLOWLOCATION error message is misleading Changed paths: U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic001.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt 2010-04-22 11:31:12 UTC (rev 298312) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt 2010-04-22 11:49:10 UTC (rev 298313) @@ -17,6 +17,6 @@ var_dump($succes); ?> --EXPECTF-- -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(in safe_mode or an )?%ropen_basedir is set in %s.php on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(safe_mode is enabled or an )?%ropen_basedir is set in %s.php on line %d bool(false) Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic001.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic001.phpt 2010-04-22 11:31:12 UTC (rev 298312) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic001.phpt 2010-04-22 11:49:10 UTC (rev 298313) @@ -30,6 +30,6 @@ --EXPECTF-- *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set in %s on line %d bool(false) ===DONE=== Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt 2010-04-22 11:31:12 UTC (rev 298312) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt 2010-04-22 11:49:10 UTC (rev 298313) @@ -17,6 +17,6 @@ var_dump($succes); ?> --EXPECTF-- -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(in safe_mode or an )?%ropen_basedir is set in %s.php on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(safe_mode is enabled or an )?%ropen_basedir is set in %s.php on line %d bool(false) Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt 2010-04-22 11:31:12 UTC (rev 298312) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt 2010-04-22 11:49:10 UTC (rev 298313) @@ -30,6 +30,6 @@ Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set in %s on line %d bool(false) Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt 2010-04-22 11:31:12 UTC (rev 298312) +++ php/php-src/trunk/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt 2010-04-22 11:49:10 UTC (rev 298313) @@ -17,6 +17,6 @@ var_dump($succes); ?> --EXPECTF-- -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(in safe_mode or an )?%ropen_basedir is set in %s.php on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(safe_mode is enabled or an )?%ropen_basedir is set in %s.php on line %d bool(false) Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt 2010-04-22 11:31:12 UTC (rev 298312) +++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt 2010-04-22 11:49:10 UTC (rev 298313) @@ -30,6 +30,6 @@ Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set in %s on line %d bool(false)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
