archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fix build (using libcurl 7.21.0)

Browse source
This commit is contained in:
Felipe Pena 2011-11-22 21:10:24 +00:00
parent 16fbcf7188
commit d0839fc837
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/curl/interface.c
View file

@ -767,10 +767,10 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECORD); REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECORD);
REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECEIVE); REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECEIVE);
#endif #endif
#if LIBCURL_VERSION_NUM >= 0x071403 /* Available since 7.21.3 */ #if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
REGISTER_CURL_CONSTANT(CURLOPT_RESOLVE); REGISTER_CURL_CONSTANT(CURLOPT_RESOLVE);
#endif #endif
#if LIBCURL_VERSION_NUM >= 0x071406 /* Available since 7.21.6 */ #if LIBCURL_VERSION_NUM >= 0x071506 /* Available since 7.21.6 */
REGISTER_CURL_CONSTANT(CURLOPT_ACCEPT_ENCODING); REGISTER_CURL_CONSTANT(CURLOPT_ACCEPT_ENCODING);
REGISTER_CURL_CONSTANT(CURLOPT_TRANSFER_ENCODING); REGISTER_CURL_CONSTANT(CURLOPT_TRANSFER_ENCODING);
#endif #endif
@ -1970,7 +1970,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
case CURLOPT_SSLENGINE: case CURLOPT_SSLENGINE:
case CURLOPT_SSLENGINE_DEFAULT: case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE: case CURLOPT_SSLCERTTYPE:
#if LIBCURL_VERSION_NUM >= 0x071406 /* Available since 7.21.6 */ #if LIBCURL_VERSION_NUM >= 0x071506 /* Available since 7.21.6 */
case CURLOPT_ACCEPT_ENCODING: case CURLOPT_ACCEPT_ENCODING:
case CURLOPT_TRANSFER_ENCODING: case CURLOPT_TRANSFER_ENCODING:
#else #else
@ -2300,7 +2300,7 @@ string_copy:
#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */ #if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
case CURLOPT_MAIL_RCPT: case CURLOPT_MAIL_RCPT:
#endif #endif
#if LIBCURL_VERSION_NUM >= 0x071403 /* Available since 7.21.3 */ #if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
case CURLOPT_RESOLVE: case CURLOPT_RESOLVE:
#endif #endif
{ {
@ -2330,9 +2330,11 @@ string_copy:
case CURLOPT_MAIL_RCPT: case CURLOPT_MAIL_RCPT:
name = "CURLOPT_MAIL_RCPT"; name = "CURLOPT_MAIL_RCPT";
break; break;
#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
case CURLOPT_RESOLVE: case CURLOPT_RESOLVE:
name = "CURLOPT_RESOLVE"; name = "CURLOPT_RESOLVE";
break; break;
#endif
} }
php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must pass either an object or an array with the %s argument", name); php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must pass either an object or an array with the %s argument", name);
RETVAL_FALSE; RETVAL_FALSE;