update curl info

[m6w6/ext-http] / php_http_request_pool.c

diff --git a/php_http_request_pool.c b/php_http_request_pool.c
index 08768096071e12aea696f041ac553154f64ccab9..352c8effa9171618dd48283a7962d87df5afc8c7 100644 (file)
--- a/php_http_request_pool.c
+++ b/php_http_request_pool.c
@@ -12,8 +12,6 @@
 
 #include "php_http_api.h"
 
-#include <ext/spl/spl_iterators.h>
-
 PHP_HTTP_API php_http_request_pool_t *php_http_request_pool_init(php_http_request_pool_t *h, php_http_request_pool_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC)
 {
        php_http_request_pool_t *free_h = NULL;
@@ -59,10 +57,6 @@ PHP_HTTP_API void php_http_request_pool_dtor(php_http_request_pool_t *h)
        zend_llist_clean(&h->requests.finished);
        zend_llist_clean(&h->requests.attached);
 
-       if (h->persistent_handle_id) {
-               zval_ptr_dtor(&h->persistent_handle_id);
-       }
-
        php_http_resource_factory_free(&h->rf);
 }
 
@@ -80,7 +74,7 @@ PHP_HTTP_API STATUS php_http_request_pool_attach(php_http_request_pool_t *h, zva
 
        if (h->ops->attach) {
                char *url = NULL;
-               php_http_request_method_t m = PHP_HTTP_NO_REQUEST_METHOD;
+               char *m = NULL;
                php_http_message_body_t *body = NULL;
                php_http_request_object_t *obj = zend_object_store_get_object(request TSRMLS_CC);
 
@@ -439,7 +433,7 @@ PHP_METHOD(HttpRequestPool, wait)
                timeout_val.tv_sec = (time_t) timeout;
                timeout_val.tv_usec = PHP_HTTP_USEC(timeout) % PHP_HTTP_MCROSEC;
 
-               RETURN_SUCCESS(php_http_request_pool_wait(obj->pool, timeout ? &timeout_val : NULL));
+               RETURN_SUCCESS(php_http_request_pool_wait(obj->pool, timeout > 0 ? &timeout_val : NULL));
        }
        RETURN_FALSE;
 }