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

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

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 8efabd9202..10331a5661 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1676,7 +1676,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 			convert_to_long_ex(zvalue);
 			if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
 				if (Z_LVAL_PP(zvalue) != 0) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set");
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set");
 					RETVAL_FALSE;
 					return 1;
 				}