diff options
| author | Adam Harvey <aharvey@php.net> | 2014-03-11 11:06:39 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-03-11 11:06:39 -0700 |
| commit | 1a14eb53c4c7bff343e0df9463c6b109c0d9f469 (patch) | |
| tree | b8f15fc4b0f4eebcfc9d675e72157db86d97894c | |
| parent | adca4c355c9a08475fbcfa762be466a5a36e6ac9 (diff) | |
| parent | f8252aa537e9a31d9b910f724cc5606b388ca0fb (diff) | |
| download | php-git-1a14eb53c4c7bff343e0df9463c6b109c0d9f469.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/curl/interface.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -13,6 +13,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) - Date: . Added DateTimeImmutable::createFromMutable to create a DateTimeImmutable diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 4c200bda38..1995f23a08 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -3138,6 +3138,7 @@ PHP_FUNCTION(curl_getinfo) } break; } +#if LIBCURL_VERSION_NUM >= 0x070c03 /* Available since 7.12.3 */ case CURLINFO_SLIST: { struct curl_slist *slist; @@ -3153,6 +3154,7 @@ PHP_FUNCTION(curl_getinfo) } break; } +#endif default: RETURN_FALSE; } |