X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_pool.c;h=352c8effa9171618dd48283a7962d87df5afc8c7;hp=9ee6f7682056802700aef95cb43578f305cc0193;hb=4957436be59f65fae9cdbaec1dc865acc680862f;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405

diff --git a/php_http_request_pool.c b/php_http_request_pool.c
index 9ee6f76..352c8ef 100644
--- a/php_http_request_pool.c
+++ b/php_http_request_pool.c
@@ -10,10 +10,7 @@
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
-
-#include <Zend/zend_interfaces.h>
-#include <ext/spl/spl_iterators.h>
+#include "php_http_api.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)
 {
@@ -60,9 +57,7 @@ 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);
 }
 
 PHP_HTTP_API void php_http_request_pool_free(php_http_request_pool_t **h) {
@@ -79,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);
 
@@ -438,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;
 }