diff options
author | Adam Harvey <aharvey@php.net> | 2014-03-11 11:07:21 -0700 |
---|---|---|
committer | Adam Harvey <aharvey@php.net> | 2014-03-11 11:07:21 -0700 |
commit | 4ab192908f1c9a3874cf0450d2b8671c873d39b0 (patch) | |
tree | 3b5e84964ad453f065d52f3b6ed36b8bb229b1e5 | |
parent | 664b38a21d95c80fa75f75aadb4ac9e1725e3fdc (diff) | |
parent | 1a14eb53c4c7bff343e0df9463c6b109c0d9f469 (diff) | |
download | php-git-4ab192908f1c9a3874cf0450d2b8671c873d39b0.tar.gz |
Merge branch 'PHP-5.6'
-rw-r--r-- | ext/curl/interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |