X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_pool_api.c;h=7dc809ba665f60883958d4748d92abf006f857a6;hb=f6280c0f47b07d5c6079f7074491b6173c89599f;hp=610412ac24f28e4477f40c70aef8e7d96cd99b63;hpb=208e6a34f0d48978279a2e80d336e19dca936486;p=m6w6%2Fext-http

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 610412a..7dc809b 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -18,8 +18,10 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
 #include "php.h"
+
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -28,8 +30,6 @@
 #include "php_http_request_object.h"
 #include "php_http_requestpool_object.h"
 
-#ifdef ZEND_ENGINE_2
-
 #ifndef HTTP_DEBUG_REQPOOLS
 #	define HTTP_DEBUG_REQPOOLS 0
 #endif
@@ -108,7 +108,7 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
 {
 	getObjectEx(http_request_object, req, request);
 #if HTTP_DEBUG_REQPOOLS
-	fprintf(stderr, "Detaching request %p (pool: %p) from pool %p\n", req, req->pool, pool);
+	fprintf(stderr, "Detaching request %p from pool %p\n", req, pool);
 #endif
 	if (req->pool != pool) {
 		http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool");
@@ -159,7 +159,7 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D
 PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
 {
 #if HTTP_DEBUG_REQPOOLS
-	fprintf(stderr, "Attempt to send requests of pool %p\n", pool);
+	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
@@ -240,7 +240,7 @@ static int http_request_pool_compare_handles(void *h1, void *h2)
 }
 /* }}} */
 
-#endif /* ZEND_ENGINE_2 */
+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
 
 
 /*