- release 0.19.0

[m6w6/ext-http] / http_request_pool_api.c

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index c3820c41ed305224063d91ce894855429e2c81ff..48c1cde8a2995bb1496e9192e8373549cce4c350 100644 (file)
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -15,20 +15,20 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.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"
 #include "php_http_request_api.h"
-#include "php_http_request_pool_api.h"
 #include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
 #include "php_http_requestpool_object.h"
 
 #ifndef HTTP_DEBUG_REQPOOLS
-#      define HTTP_DEBUG_REQPOOLS 1
+#      define HTTP_DEBUG_REQPOOLS 0
 #endif
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
@@ -120,6 +120,7 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 /* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */
 PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC)
 {
+       CURLMcode code;
        getObjectEx(http_request_object, req, request);
        
 #if HTTP_DEBUG_REQPOOLS
@@ -133,22 +134,18 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
 #endif
        } else if (req->pool != pool) {
                http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request));
+       } else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) {
+               http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
        } else {
-               CURLMcode code;
-
-               if (CURLM_OK == (code = curl_multi_remove_handle(pool->ch, req->ch))) {
-                       req->pool = NULL;
-                       zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles);
-                       zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles);
-                       
+               req->pool = NULL;
+               zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles);
+               zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles);
+               
 #if HTTP_DEBUG_REQPOOLS
-                       fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool);
+               fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool);
 #endif
-               
-                       return SUCCESS;
-               } else {
-                       http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
-               }
+       
+               return SUCCESS;
        }
        return FAILURE;
 }
@@ -272,7 +269,7 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
        
        while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
        
-       while (msg = curl_multi_info_read(pool->ch, &remaining)) {
+       while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
                if (CURLMSG_DONE == msg->msg) {
                        if (CURLE_OK != msg->data.result) {
                                http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));