X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl.c;h=1ec6624cc21a07b7e3d6957b398621b393ff989d;hp=863b342e294fdd2780f039196a5d3c7601872a34;hb=0fa2672890a4fe58c3418670e57a511b3ea7189c;hpb=55d74c2d07edcf6d51fe62bc257c3bde0f7f25d4

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 863b342..1ec6624 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -182,22 +182,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);
 	}
 
@@ -221,6 +218,7 @@ static int php_http_curle_seek_callback(void *userdata, curl_off_t offset, int o
 static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx)
 {
 	php_http_client_curl_handler_t *h = ctx;
+	unsigned utype = PHP_HTTP_CLIENT_DEBUG_INFO;
 
 	/* catch progress */
 	switch (type) {
@@ -264,20 +262,43 @@ static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
 				h->client->callback.progress.func(h->client->callback.progress.arg, h->client, &h->queue, &h->progress);
 			}
 			break;
+
 		case CURLINFO_HEADER_OUT:
-		case CURLINFO_DATA_OUT:
+			utype |= PHP_HTTP_CLIENT_DEBUG_HEADER;
+			goto data_out;
+
 		case CURLINFO_SSL_DATA_OUT:
+			utype |= PHP_HTTP_CLIENT_DEBUG_SSL;
+			goto data_out;
+
+		case CURLINFO_DATA_OUT:
+		data_out:
+			utype |= PHP_HTTP_CLIENT_DEBUG_OUT;
 			h->progress.info = "send";
 			break;
+
 		case CURLINFO_HEADER_IN:
-		case CURLINFO_DATA_IN:
+			utype |= PHP_HTTP_CLIENT_DEBUG_HEADER;
+			goto data_in;
+
 		case CURLINFO_SSL_DATA_IN:
+			utype |= PHP_HTTP_CLIENT_DEBUG_SSL;
+			goto data_in;
+
+		case CURLINFO_DATA_IN:
+		data_in:
+			utype |= PHP_HTTP_CLIENT_DEBUG_IN;
 			h->progress.info = "receive";
 			break;
+
 		default:
 			break;
 	}
 
+	if (h->client->callback.debug.func) {
+		h->client->callback.debug.func(h->client->callback.debug.arg, h->client, &h->queue, utype, data, length);
+	}
+
 #if 0
 	/* debug */
 	_dpf(type, data, length);
@@ -2028,6 +2049,7 @@ static void php_http_client_curl_dtor(php_http_client_t *h)
 
 	if (curl->ev_ops) {
 		curl->ev_ops->dtor(&curl->ev_ctx);
+		curl->ev_ops = NULL;
 	}
 	curl->unfinished = 0;
 
@@ -2143,6 +2165,11 @@ static ZEND_RESULT_CODE php_http_client_curl_dequeue(php_http_client_t *h, php_h
 	php_http_client_curl_handler_t *handler = enqueue->opaque;
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
+	if (h->callback.depth) {
+		php_error_docref(NULL TSRMLS_CC, 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);