From: Michael Wallner <mike@php.net>
Date: Fri, 9 Sep 2005 12:42:42 +0000 (+0000)
Subject: - debugging noise
X-Git-Tag: RELEASE_0_13_0~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5cd11bcc02e4a06fc0dec9fd398f5fb8c111caa8;p=m6w6%2Fext-http

- debugging noise
---

diff --git a/http_request_api.c b/http_request_api.c
index aac75b3..2af5774 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -788,6 +788,10 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 {
 	HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv);
 
+#if 0
+	fprintf(stderr, "DEBUG: %s\n", data);
+#endif
+
 	switch (type)
 	{
 		case CURLINFO_DATA_IN:
diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 64224fe..76bd181 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -179,13 +179,12 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D
 		efree(handles);
 	}
 #if HTTP_DEBUG_REQPOOLS
-	fprintf(srderr, "Destroying %d request bodies of pool %p\n", zend_llist_count(&pool->bodies), pool);
+	fprintf(stderr, "Destroying %d request bodies of pool %p\n", zend_llist_count(&pool->bodies), pool);
 #endif
 	/* free created bodies too */
 	zend_llist_clean(&pool->bodies);
 }
 
-
 /* {{{ STATUS http_request_pool_send(http_request_pool *) */
 PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
 {
@@ -193,9 +192,6 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
 	fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool);
 #endif
 	while (http_request_pool_perform(pool)) {
-#if HTTP_DEBUG_REQPOOLS
-		fprintf(stderr, "> %d unfinished requests of pool %p remaining\n", pool->unfinished, pool);
-#endif
 		if (SUCCESS != http_request_pool_select(pool)) {
 #ifdef PHP_WIN32
 			http_error(HE_WARNING, HTTP_E_SOCKET, WSAGetLastError());
@@ -207,6 +203,17 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
 	}
 #if HTTP_DEBUG_REQPOOLS
 	fprintf(stderr, "Finished sending %d HttpRequests of pool %p (still unfinished: %d)\n", zend_llist_count(&pool->handles), pool, pool->unfinished);
+	{
+		int remaining = 0;
+		CURLMsg *msg;
+		/*
+		 * FIXXME: populate --somehow
+		 */
+		do {
+			if (msg = curl_multi_info_read(pool->ch, &remaining))
+				fprintf(stderr, "CURL: %s (%d)\n", curl_easy_strerror(msg->data.result), msg->data.result);
+		} while (remaining);
+	}
 #endif
 	zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
 	return SUCCESS;