From: Pierre Joye <pajoye@php.net>
Date: Thu, 22 Apr 2010 11:49:10 +0000 (+0000)
Subject: - Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading
X-Git-Tag: php-5.4.0alpha1~191^2~1701
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f66e02b8fc1569f0d088e811a8da0593bb167768;p=php

- Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading
---

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)