Re: svn: /php/php-src/trunk/ext/curl/ interface.c
| From: | Pierrick Charron | Date: | Tue, 22 Nov 2011 22:00:25 +0000 |
| Subject: | Re: svn: /php/php-src/trunk/ext/curl/ interface.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-67112@lists.php.net to get a copy of this message | ||
Thanks :)
On 22 November 2011 16:10, Felipe Pena <felipe@php.net> wrote:
> felipe Tue, 22 Nov 2011 21:10:24 +0000
>
> Revision:
> http://svn.php.net/viewvc?view=revision&revision=319702
>
> Log:
> - Fix build (using libcurl 7.21.0)
>
> Changed paths:
> U php/php-src/trunk/ext/curl/interface.c
>
> Modified: php/php-src/trunk/ext/curl/interface.c
> ===================================================================
> --- php/php-src/trunk/ext/curl/interface.c 2011-11-22 20:01:32 UTC (rev 319701)
> +++ php/php-src/trunk/ext/curl/interface.c 2011-11-22 21:10:24 UTC (rev 319702)
> @@ -767,10 +767,10 @@
> REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECORD);
> REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECEIVE);
> #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);
> #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_TRANSFER_ENCODING);
> #endif
> @@ -1970,7 +1970,7 @@
> case CURLOPT_SSLENGINE:
> case CURLOPT_SSLENGINE_DEFAULT:
> 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_TRANSFER_ENCODING:
> #else
> @@ -2300,7 +2300,7 @@
> #if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
> case CURLOPT_MAIL_RCPT:
> #endif
> -#if LIBCURL_VERSION_NUM >= 0x071403 /* Available since 7.21.3 */
> +#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
> case CURLOPT_RESOLVE:
> #endif
> {
> @@ -2330,9 +2330,11 @@
> case CURLOPT_MAIL_RCPT:
> name =
> "CURLOPT_MAIL_RCPT";
> break;
> +#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
> case CURLOPT_RESOLVE:
> name =
> "CURLOPT_RESOLVE";
> break;
> +#endif
> }
> php_error_docref(NULL TSRMLS_CC, E_WARNING,
> "You must pass either an object or an array with the %s argument", name);
> RETVAL_FALSE;
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>