summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2007-05-22 08:39:20 +0000
committerSara Golemon <pollita@php.net>2007-05-22 08:39:20 +0000
commit5040dbd5e81fe31bc1681de08a77cc3eb16a795e (patch)
treea64947c97856062b07200e93fd91654674cb6ad7
parent89d57c7c6729fc632f8debd67628e3ff99e4b270 (diff)
downloadphp-git-5040dbd5e81fe31bc1681de08a77cc3eb16a795e.tar.gz
MFH(r-1.112) Add CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS option constants
-rw-r--r--ext/curl/interface.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 1d65fa3e65..8a909181b8 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -387,6 +387,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);
@@ -430,6 +433,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);
@@ -1224,6 +1230,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:
@@ -1240,6 +1249,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: