- fix CURLOPT_TIMEOUT_MS support (available since 7.16.2)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index d47dad8ece3f06f3d9dce09d96a373597e2a3b86..57467ffc19e178125c559eb992ac80f00d29d4d9 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -385,7 +385,7 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD);
        REGISTER_CURL_CONSTANT(CURLOPT_RANGE);
        REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT);
-#ifdef CURLOPT_TIMEOUT_MS
+#if LIBCURL_VERSION_NUM > 0x071002
        REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS);
 #endif
        REGISTER_CURL_CONSTANT(CURLOPT_POSTFIELDS);
@@ -431,7 +431,7 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_RANDOM_FILE);
        REGISTER_CURL_CONSTANT(CURLOPT_EGDSOCKET);
        REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT);
-#ifdef CURLOPT_CONNECTTIMEOUT_MS
+#if LIBCURL_VERSION_NUM > 0x071002
        REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS);
 #endif
        REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER);
@@ -1239,7 +1239,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                 case CURLOPT_MUTE:
 #endif
                case CURLOPT_TIMEOUT:
-#ifdef CURLOPT_TIMEOUT_MS
+#if LIBCURL_VERSION_NUM > 0x071002
                case CURLOPT_TIMEOUT_MS:
 #endif
                case CURLOPT_FTP_USE_EPSV:
@@ -1258,7 +1258,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                case CURLOPT_FRESH_CONNECT:
                case CURLOPT_FORBID_REUSE:
                case CURLOPT_CONNECTTIMEOUT:
-#ifdef CURLOPT_CONNECTTIMEOUT_MS
+#if LIBCURL_VERSION_NUM > 0x071002
                case CURLOPT_CONNECTTIMEOUT_MS:
 #endif
                case CURLOPT_SSL_VERIFYHOST: