X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl.c;h=18d75d739f2ff2b86a6d86628bde0ed59eb9e2bf;hp=863b342e294fdd2780f039196a5d3c7601872a34;hb=1ac722a1169ffe0f804f8d30a79c2f270d0d7999;hpb=88362013f6230e939a14658d9123dc984f5807c6

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 863b342..18d75d7 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -221,6 +221,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 +265,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 +2052,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;