X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_client_curl_user.c;h=95ea6f5388d6abbeea594bb9b939e4312dfe97c2;hb=e7b1f15da7b31de77e75cd81c2b2fc8816200f27;hp=a0449a2f27374d0b6f06813189cc2f47f6175351;hpb=700883ba05724a9dd14fa6d5a2eded658cf0496c;p=m6w6%2Fext-http

diff --git a/src/php_http_client_curl_user.c b/src/php_http_client_curl_user.c
index a0449a2..95ea6f5 100644
--- a/src/php_http_client_curl_user.c
+++ b/src/php_http_client_curl_user.c
@@ -15,14 +15,14 @@
 #include "php_network.h"
 #include "zend_closures.h"
 
-#if PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_LIBCURL
 
 typedef struct php_http_client_curl_user_ev {
 	php_stream *socket;
 	php_http_client_curl_user_context_t *context;
 } php_http_client_curl_user_ev_t;
 
-static void php_http_client_curl_user_handler(INTERNAL_FUNCTION_PARAMETERS)
+static ZEND_NAMED_FUNCTION(php_http_client_curl_user_handler)
 {
 	zval *zstream = NULL, *zclient = NULL;
 	php_stream *stream = NULL;
@@ -57,9 +57,7 @@ static void php_http_client_curl_user_timer(CURLM *multi, long timeout_ms, void
 	fprintf(stderr, "\ntimer <- timeout_ms: %ld\n", timeout_ms);
 #endif
 
-	if (timeout_ms <= 0) {
-		php_http_client_curl_loop(context->client, CURL_SOCKET_TIMEOUT, 0);
-	} else {
+	if (timeout_ms >= 0) {
 		zval args[1], *ztimeout = &args[0];
 
 		ZVAL_LONG(ztimeout, timeout_ms);
@@ -316,7 +314,7 @@ PHP_MINIT_FUNCTION(http_client_curl_user)
 	return SUCCESS;
 }
 
-#endif /* PHP_HTTP_HAVE_CURL */
+#endif /* PHP_HTTP_HAVE_LIBCURL */
 
 /*
  * Local variables: