summaryrefslogtreecommitdiff
path: root/ext/curl/interface.c
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2012-08-26 09:03:45 -0400
committerPierrick Charron <pierrick@php.net>2012-08-26 09:03:45 -0400
commit101fd2d3fde0d963f9658b2fc11ac0e7e27258d9 (patch)
treea2b25c53a7e09912c2483457c1ff60fe5903bca9 /ext/curl/interface.c
parent14c88ff82c1832c2e0d2c4ee49c0170cad3158d5 (diff)
downloadphp-git-101fd2d3fde0d963f9658b2fc11ac0e7e27258d9.tar.gz
Fix bad version for CURLINFO_CERTINFO
CURLINFO_CERTINFO is available since 7.19.1. The cURL extension allow to use it since this same version but the internal function create_certinfo used internally for CURLINFO_CERTINFO usage is only usable for version greater than 7.19.1 which will cause problem if the user is using the 7.19.1 cURL version
Diffstat (limited to 'ext/curl/interface.c')
-rw-r--r--ext/curl/interface.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 899ea603c1..7f865fe958 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -786,6 +786,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
/* Curl Share constants */
+ REGISTER_CURL_CONSTANT(CURLSHOPT_NONE);
REGISTER_CURL_CONSTANT(CURLSHOPT_SHARE);
REGISTER_CURL_CONSTANT(CURLSHOPT_UNSHARE);
@@ -814,6 +815,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
+ REGISTER_CURL_CONSTANT(CURL_TIMECOND_NONE);
/* Curl version constants */
REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6);
@@ -1743,7 +1745,7 @@ static void alloc_curl_handle(php_curl **ch)
}
/* }}} */
-#if LIBCURL_VERSION_NUM > 0x071301
+#if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
/* {{{ split_certinfo
*/
static void split_certinfo(char *string, zval *hash)