com php-src: Fix compile error with theoretically supported versions of libcurl < 7.12.3.: NEWS ext/curl/interface.c

Commit: f8252aa537e9a31d9b910f724cc5606b388ca0fb Author: Adam Harvey <aharvey@php.net> Tue, 11 Mar 2014 11:04:26 -0700 Parents: cb5178a450055f5b9378efb55732f7e263d210b6 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f8252aa537e9a31d9b910f724cc5606b388ca0fb Log: Fix compile error with theoretically supported versions of libcurl < 7.12.3. Changed paths: M NEWS M ext/curl/interface.c Diff: diff --git a/NEWS b/NEWS index de44e38..94a0927 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ PHP NEWS - cURL: . Fixed bug #66109 (Can't reset CURLOPT_CUSTOMREQUEST to default behaviour) (Tjerk) + . Fix compilation on libcurl versions between 7.10.5 and 7.12.2, inclusive. + (Adam) - GD: . Fixed bug #66714 ( imageconvolution breakage). (Brad Daily) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 09e20d3..87b871f 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -3142,6 +3142,7 @@ PHP_FUNCTION(curl_getinfo) } break; } +#if LIBCURL_VERSION_NUM >= 0x070c03 /* Available since 7.12.3 */ case CURLINFO_SLIST: { struct curl_slist *slist; @@ -3157,6 +3158,7 @@ PHP_FUNCTION(curl_getinfo) } break; } +#endif default: RETURN_FALSE; }