]> granicus.if.org Git - php/commitdiff
Fix bad version for CURLINFO_CERTINFO
authorPierrick Charron <pierrick@php.net>
Sun, 26 Aug 2012 13:03:45 +0000 (09:03 -0400)
committerPierrick Charron <pierrick@php.net>
Sun, 26 Aug 2012 13:03:45 +0000 (09:03 -0400)
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

ext/curl/interface.c

index 899ea603c13ba3a8f309f33db336db26de6bc483..7f865fe95868bfaa58ed066131737aaa1639fda3 100644 (file)
@@ -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)