diff options
author | Pierre Joye <pajoye@php.net> | 2010-04-22 11:49:10 +0000 |
---|---|---|
committer | Pierre Joye <pajoye@php.net> | 2010-04-22 11:49:10 +0000 |
commit | f66e02b8fc1569f0d088e811a8da0593bb167768 (patch) | |
tree | 0125958c5c0a4239f9fdc9dc4978ac5fba08555c | |
parent | b1e3ae0e992ee8885b783b3081bb50a6634c4885 (diff) | |
download | php-git-f66e02b8fc1569f0d088e811a8da0593bb167768.tar.gz |
- Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading
-rw-r--r-- | ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt | 2 | ||||
-rw-r--r-- | ext/curl/tests/curl_setopt_basic001.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt b/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt index 68465e6dad..c00e1d2080 100644 --- a/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt +++ b/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt @@ -17,6 +17,6 @@ curl_close($ch); 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) diff --git a/ext/curl/tests/curl_setopt_basic001.phpt b/ext/curl/tests/curl_setopt_basic001.phpt index 99cb538d31..178fbf7c13 100644 --- a/ext/curl/tests/curl_setopt_basic001.phpt +++ b/ext/curl/tests/curl_setopt_basic001.phpt @@ -30,6 +30,6 @@ var_dump( $curl_content ); 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) |