summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2014-03-11 11:04:26 -0700
committerAdam Harvey <aharvey@php.net>2014-03-11 11:04:26 -0700
commitf8252aa537e9a31d9b910f724cc5606b388ca0fb (patch)
treeca0ea39e9449ab7e0946925fcabc17bd93a6bdaf
parentcb5178a450055f5b9378efb55732f7e263d210b6 (diff)
downloadphp-git-f8252aa537e9a31d9b910f724cc5606b388ca0fb.tar.gz
Fix compile error with theoretically supported versions of libcurl < 7.12.3.
-rw-r--r--NEWS2
-rw-r--r--ext/curl/interface.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index de44e388da..94a09272f5 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 09e20d3a67..87b871f203 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;
}