Commit: 101fd2d3fde0d963f9658b2fc11ac0e7e27258d9 Author: Pierrick Charron <pierr...@php.net> Sun, 26 Aug 2012 09:03:45 -0400 Parents: 14c88ff82c1832c2e0d2c4ee49c0170cad3158d5 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=101fd2d3fde0d963f9658b2fc11ac0e7e27258d9 Log: 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 Changed paths: M ext/curl/interface.c Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 899ea60..7f865fe 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) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
