diff options
| author | Pierre Joye <pajoye@php.net> | 2010-04-22 08:58:07 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-04-22 08:58:07 +0000 |
| commit | b1e3ae0e992ee8885b783b3081bb50a6634c4885 (patch) | |
| tree | 43a85afb4a6066cbecf23066e5efb34971f04dba /ext/curl | |
| parent | 7ac145d9f3884c4cbb1414ea86e70b394319d0b1 (diff) | |
| download | php-git-b1e3ae0e992ee8885b783b3081bb50a6634c4885.tar.gz | |
- Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |