]> granicus.if.org Git - php/commitdiff
- Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading
authorPierre Joye <pajoye@php.net>
Thu, 22 Apr 2010 08:58:07 +0000 (08:58 +0000)
committerPierre Joye <pajoye@php.net>
Thu, 22 Apr 2010 08:58:07 +0000 (08:58 +0000)
ext/curl/interface.c

index 8efabd9202eb4d72275e58d76cd0d7f94a1ce632..10331a56610b11f0dc16b01cc30d29a1f754a589 100644 (file)
@@ -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;
                                }