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.2.14RC1~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=033d28b5d579e3881a1f059da70597687760275b;p=php

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

diff --git a/NEWS b/NEWS
index bef365400d..bc868dcd9f 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP                                                                        NEWS
 - Fixed a NULL pointer dereference when processing invalid XML-RPC
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 
+- Fixed bug #51629 (CURLOPT_FOLLOWLOCATION error message is misleading).
+  (Pierre)
 - Fixed bug #51617 (PDO PGSQL still broken against PostGreSQL < 7.4).
   (Felipe, wdierkes at 5dollarwhitebox dot org)
 - Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML). (Felipe)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 34402d979c..939168f3af 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1386,7 +1386,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;
 				}