fix #64 (by rcanavan)

[m6w6/ext-http] / src / php_http_client_curl.h

diff --git a/src/php_http_client_curl.h b/src/php_http_client_curl.h
index abd8f993085b28f18920659e1e71e4e899da4415..61723b9b7c4f2fabb42bffd9baabc17c81c4c269 100644 (file)
--- a/src/php_http_client_curl.h
+++ b/src/php_http_client_curl.h
@@ -13,7 +13,7 @@
 #ifndef PHP_HTTP_CLIENT_CURL_H
 #define PHP_HTTP_CLIENT_CURL_H
 
-#if PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_LIBCURL
 
 struct php_http_client_curl_globals {
        php_http_client_driver_t driver;
@@ -43,13 +43,27 @@ typedef struct php_http_client_curl {
 
 static inline void php_http_client_curl_get_timeout(php_http_client_curl_t *curl, long max_tout, struct timeval *timeout)
 {
-       if ((CURLM_OK == curl_multi_timeout(curl->handle->multi, &max_tout)) && (max_tout > 0)) {
-               timeout->tv_sec = max_tout / 1000;
-               timeout->tv_usec = (max_tout % 1000) * 1000;
-       } else {
-               timeout->tv_sec = 0;
-               timeout->tv_usec = 1000;
+       timeout->tv_sec = 0;
+       timeout->tv_usec = 0;
+
+       /* always returns CURLM_OK, check max_tout instead */
+       curl_multi_timeout(curl->handle->multi, &max_tout);
+
+       if (!max_tout) {
+               /* immediately */
+               return;
        }
+
+       if (max_tout < 0) {
+               /* 5ms */
+               max_tout = 5;
+       } else if (max_tout > 1000) {
+               /* 1s */
+               max_tout = 1000;
+       }
+
+       timeout->tv_sec = max_tout / 1000;
+       timeout->tv_usec = (max_tout % 1000) * 1000;
 }
 
 PHP_HTTP_API void php_http_client_curl_responsehandler(php_http_client_t *client);
@@ -59,7 +73,7 @@ PHP_HTTP_API php_http_client_ops_t *php_http_client_curl_get_ops(void);
 PHP_MINIT_FUNCTION(http_client_curl);
 PHP_MSHUTDOWN_FUNCTION(http_client_curl);
 
-#endif /* PHP_HTTP_HAVE_CURL */
+#endif /* PHP_HTTP_HAVE_LIBCURL */
 
 #endif /* PHP_HTTP_CLIENT_CURL_H */