#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;
+};
typedef struct php_http_client_curl_handle {
CURLM *multi;
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);
PHP_HTTP_API void php_http_client_curl_loop(php_http_client_t *client, curl_socket_t s, int curl_action);
+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 */