- Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading

diff --git a/NEWS b/NEWS
index 92ca9f91d8644fc8a701000d4e10a8e7a2e3e724..5cc36dacbbf03b407e31b01e129cb09988d9767d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ PHP                                                                        NEWS
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) 
 
+- Fixed bug #51629 (CURLOPT_FOLLOWLOCATION error message is misleading).
+  (Pierre)
 - Fixed bug #51627 (script path not correctly evaluated).
   (russell dot tempero at rightnow dot com)
 - Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML). (Felipe)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index b1bedb75f366927bc743b11d5091abb5bc97aae4..f8b8e57635226d6ca7179e85233d7cc99a6f2479 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1678,7 +1678,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;
                                }