X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl.c;h=9d41e2979f4b61c1e69852b5fecb6a7aa46848ae;hp=be04be89296d47728cc8aa63571d7675eca35c63;hb=d7652a44e061886c95dcb730e13c52163039d429;hpb=e1d5ca36e13696a2e87b618165669fc7c53709c1

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index be04be8..9d41e29 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -177,22 +177,19 @@ static int php_http_curle_progress_callback(void *ctx, double dltotal, double dl
 #endif
 {
 	php_http_client_curl_handler_t *h = ctx;
-	zend_bool update = 0;
 
 	if (h->progress.dl.total != dltotal
 	||	h->progress.dl.now != dlnow
 	||	h->progress.ul.total != ultotal
 	||	h->progress.ul.now != ulnow
 	) {
-		update = 1;
-
 		h->progress.dl.total = dltotal;
 		h->progress.dl.now = dlnow;
 		h->progress.ul.total = ultotal;
 		h->progress.ul.now = ulnow;
 	}
 
-	if (update && h->client->callback.progress.func) {
+	if (h->client->callback.progress.func) {
 		h->client->callback.progress.func(h->client->callback.progress.arg, h->client, &h->queue, &h->progress);
 	}
 
@@ -2195,6 +2192,11 @@ static ZEND_RESULT_CODE php_http_client_curl_dequeue(php_http_client_t *h, php_h
 	php_http_client_curl_t *curl = h->ctx;
 	php_http_client_curl_handler_t *handler = enqueue->opaque;
 
+	if (h->callback.depth) {
+		php_error_docref(NULL, E_WARNING, "Could not dequeue request while executing callbacks");
+		return FAILURE;
+	}
+
 	php_http_client_curl_handler_clear(handler);
 	if (CURLM_OK == (rs = curl_multi_remove_handle(curl->handle->multi, handler->handle))) {
 		zend_llist_del_element(&h->requests, handler->handle, (int (*)(void *, void *)) compare_queue);
@@ -2258,16 +2260,17 @@ static int php_http_client_curl_once(php_http_client_t *h)
 {
 	php_http_client_curl_t *curl = h->ctx;
 
-	if (curl->ev_ops) {
-		curl->ev_ops->once(curl->ev_ctx);
-	} else {
-		while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(curl->handle->multi, &curl->unfinished));
-	}
+	if (!h->callback.depth) {
+		if (curl->ev_ops) {
+			curl->ev_ops->once(curl->ev_ctx);
+		} else {
+			while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(curl->handle->multi, &curl->unfinished));
+		}
 
-	php_http_client_curl_responsehandler(h);
+		php_http_client_curl_responsehandler(h);
+	}
 
 	return curl->unfinished;
-
 }
 
 static ZEND_RESULT_CODE php_http_client_curl_exec(php_http_client_t *h)