Add support for CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 11d2eac9d73366bd481e449fd9d1515b07b178a0..9be8ae568990272c90eaebc58691ae197065a411 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -385,6 +385,9 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD);
        REGISTER_CURL_CONSTANT(CURLOPT_RANGE);
        REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT);
+#ifdef CURLOPT_TIMEOUT_MS
+       REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS);
+#endif
        REGISTER_CURL_CONSTANT(CURLOPT_POSTFIELDS);
        REGISTER_CURL_CONSTANT(CURLOPT_REFERER);
        REGISTER_CURL_CONSTANT(CURLOPT_USERAGENT);
@@ -428,6 +431,9 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_RANDOM_FILE);
        REGISTER_CURL_CONSTANT(CURLOPT_EGDSOCKET);
        REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT);
+#ifdef CURLOPT_CONNECTTIMEOUT_MS
+       REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS);
+#endif
        REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER);
        REGISTER_CURL_CONSTANT(CURLOPT_CAINFO);
        REGISTER_CURL_CONSTANT(CURLOPT_CAPATH);
@@ -1228,6 +1234,9 @@ 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
+               case CURLOPT_TIMEOUT_MS:
+#endif
                case CURLOPT_FTP_USE_EPSV:
                case CURLOPT_LOW_SPEED_LIMIT:
                case CURLOPT_SSLVERSION:
@@ -1244,6 +1253,9 @@ 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
+               case CURLOPT_CONNECTTIMEOUT_MS:
+#endif
                case CURLOPT_SSL_VERIFYHOST:
                case CURLOPT_SSL_VERIFYPEER:
                case CURLOPT_DNS_USE_GLOBAL_CACHE: