remodel file adding to accept paths, streams and plain data as upload files

[m6w6/ext-http] / php_http_request_pool.c

diff --git a/php_http_request_pool.c b/php_http_request_pool.c
index 379e3b152d4ee202d5b30c9c3f7d48ddb8d62bb3..4930122b5517ba0e2088103d5d2f533b3079c708 100644 (file)
--- a/php_http_request_pool.c
+++ b/php_http_request_pool.c
@@ -1,8 +1,16 @@
-
-#include "php_http.h"
-
-#include <Zend/zend_interfaces.h>
-#include <ext/spl/spl_iterators.h>
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
+#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)
 {
@@ -14,7 +22,7 @@ PHP_HTTP_API php_http_request_pool_t *php_http_request_pool_init(php_http_reques
        memset(h, 0, sizeof(*h));
 
        h->ops = ops;
-       h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, NULL, NULL TSRMLS_CC);
+       h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, NULL, NULL);
        zend_llist_init(&h->requests.attached, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
        zend_llist_init(&h->requests.finished, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
        TSRMLS_SET_CTX(h->ts);
@@ -52,6 +60,8 @@ PHP_HTTP_API void php_http_request_pool_dtor(php_http_request_pool_t *h)
        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) {
@@ -72,7 +82,7 @@ PHP_HTTP_API STATUS php_http_request_pool_attach(php_http_request_pool_t *h, zva
                php_http_message_body_t *body = NULL;
                php_http_request_object_t *obj = zend_object_store_get_object(request TSRMLS_CC);
 
-               if (SUCCESS != php_http_request_object_requesthandler(obj, request, &m, &url, &body)) {
+               if (SUCCESS != php_http_request_object_requesthandler(obj, request, &m, &url, &body TSRMLS_CC)) {
                        return FAILURE;
                }
                if (SUCCESS == h->ops->attach(h, obj->request, m, url, body)) {
@@ -130,8 +140,6 @@ PHP_HTTP_API int php_http_request_pool_once(php_http_request_pool_t *h)
 
 PHP_HTTP_API STATUS php_http_request_pool_exec(php_http_request_pool_t *h)
 {
-       TSRMLS_FETCH_FROM_CTX(h->ts);
-
        if (h->ops->exec) {
                return h->ops->exec(h);
        }
@@ -556,13 +564,23 @@ PHP_METHOD(HttpRequestPool, enableEvents)
 
 PHP_MINIT_FUNCTION(http_request_pool)
 {
-       PHP_HTTP_REGISTER_CLASS(http\\request, Pool, http_request_pool, php_http_object_class_entry, 0);
+       PHP_HTTP_REGISTER_CLASS(http\\Request, Pool, http_request_pool, php_http_object_class_entry, 0);
        php_http_request_pool_class_entry->create_object = php_http_request_pool_object_new;
        memcpy(&php_http_request_pool_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        php_http_request_pool_object_handlers.clone_obj = NULL;
 
-       zend_class_implements(php_http_request_pool_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_iterator, php_http_fluently_callable_class_entry);
+       zend_class_implements(php_http_request_pool_class_entry TSRMLS_CC, 2, spl_ce_Countable, zend_ce_iterator);
 
        return SUCCESS;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+