cvs: php-src /ext/curl interface.c

pollita Tue Apr 17 18:39:18 2007 UTC Modified files: /php-src/ext/curl interface.c Log: Add support for CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.111&r2=1.112&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.111 php-src/ext/curl/interface.c:1.112 --- php-src/ext/curl/interface.c:1.111 Fri Mar 9 01:22:47 2007 +++ php-src/ext/curl/interface.c Tue Apr 17 18:39:18 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.111 2007/03/09 01:22:47 rasmus Exp $ */ +/* $Id: interface.c,v 1.112 2007/04/17 18:39:18 pollita Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -385,6 +385,9 @@ 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 @@ 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 @@ 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 @@ 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: