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 | 0fecc8c6a02d0e8c84d8169fecea710579bf78a3 (patch) | |
| tree | 3e2f7943b349c4eb502bfa11cfbef75b0d24c1e3 | |
| parent | 592daf8453f5b7435a0304375146523a6eaee420 (diff) | |
| download | php-git-0fecc8c6a02d0e8c84d8169fecea710579bf78a3.tar.gz | |
- Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/curl/interface.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 b1bedb75f3..f8b8e57635 100644 --- 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; } |