diff options
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/interface.c | 13 | ||||
| -rw-r--r-- | ext/curl/streams.c | 2 | ||||
| -rw-r--r-- | ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt | 2 | ||||
| -rw-r--r-- | ext/curl/tests/curl_setopt_basic001.phpt | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 1f6f6a928..35cc1d996 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c 294464 2010-02-03 20:53:31Z pajoye $ */ +/* $Id: interface.c 298299 2010-04-22 08:58:07Z pajoye $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -370,7 +370,7 @@ PHP_MINFO_FUNCTION(curl) #ifdef CURL_VERSION_IPV6 {"IPv6", CURL_VERSION_IPV6}, #endif -#if LIBCURL_VERSION_NUM > 0x070a09 /* 7.10.1 */ +#if LIBCURL_VERSION_NUM > 0x070b00 /* 7.11.1 */ {"Largefile", CURL_VERSION_LARGEFILE}, #endif #if LIBCURL_VERSION_NUM > 0x070a05 /* 7.10.6 */ @@ -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; } @@ -1970,7 +1970,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu SAVE_CURL_ERROR(ch, error); if (error != CURLE_OK) { - RETVAL_FALSE + RETVAL_FALSE; return 1; } @@ -2095,6 +2095,11 @@ PHP_FUNCTION(curl_setopt) ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl); + if (options <= 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl configuration option"); + RETURN_FALSE; + } + if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) { RETURN_TRUE; } else { diff --git a/ext/curl/streams.c b/ext/curl/streams.c index 39d78f740..4b591e2f8 100644 --- a/ext/curl/streams.c +++ b/ext/curl/streams.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c 294462 2010-02-03 20:49:03Z pajoye $ */ +/* $Id: streams.c 293732 2010-01-19 13:44:08Z jani $ */ /* This file implements cURL based wrappers. * NOTE: If you are implementing your own streams that are intended to diff --git a/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt b/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt index 68465e6da..c00e1d208 100644 --- a/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt +++ b/ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt @@ -17,6 +17,6 @@ curl_close($ch); var_dump($succes); ?> --EXPECTF-- -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(in safe_mode or an )?%ropen_basedir is set in %s.php on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(safe_mode is enabled or an )?%ropen_basedir is set in %s.php on line %d bool(false) diff --git a/ext/curl/tests/curl_setopt_basic001.phpt b/ext/curl/tests/curl_setopt_basic001.phpt index 99cb538d3..178fbf7c1 100644 --- a/ext/curl/tests/curl_setopt_basic001.phpt +++ b/ext/curl/tests/curl_setopt_basic001.phpt @@ -30,6 +30,6 @@ var_dump( $curl_content ); Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode -Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d +Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set in %s on line %d bool(false) |