- multiple send seems to work now without bigger problems
authorMichael Wallner <mike@php.net>
Wed, 15 Jun 2005 11:55:13 +0000 (11:55 +0000)
committerMichael Wallner <mike@php.net>
Wed, 15 Jun 2005 11:55:13 +0000 (11:55 +0000)
http_request_pool_api.c
php_http_request_pool_api.h

index 437530350af87b17d01aa332b11ba424209b726b..a9cd4ede33fbc357deadbefd837308274ac20dbc 100644 (file)
@@ -59,7 +59,6 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
                }
        }
 
-       pool->sent = 0;
        pool->unfinished = 0;
        zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
        zend_llist_init(&pool->bodies, sizeof(http_request_body *), (llist_dtor_func_t) http_request_pool_freebody, 0);
@@ -160,14 +159,8 @@ 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
-       if (pool->sent) {
-               http_error(E_WARNING, HTTP_E_CURL, "HttpRequestPools can only be used once");
-               return FAILURE;
-       } else {
-               pool->sent = 1;
-       }
        while (http_request_pool_perform(pool)) {
 #if HTTP_DEBUG_REQPOOLS
                fprintf(stderr, "%d unfinished requests of pool %p remaining\n", pool->unfinished, pool);
index 115cd3d5202f0c38bddadb1c3d65268b327778ff..3243de936e0ea672eaee399c1f2212335a96e17e 100644 (file)
@@ -29,7 +29,6 @@
 
 typedef struct {
        CURLM *ch;
-       zend_bool sent;
        zend_llist handles;
        zend_llist bodies;
        int unfinished;