- added http_get_request_body()

[m6w6/ext-http] / http_requestpool_object.c

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index a683b05e2bb0ee83ffbc3247a1028df33575b5cf..f7161c7b0139e3ce887886a7e60d5fa44ccb24fb 100644 (file)
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -31,21 +31,28 @@
 
 #include "php_http_std_defs.h"
 #include "php_http_requestpool_object.h"
-#include "php_http_request_api.h"
+#include "php_http_request_pool_api.h"
 
 #ifdef ZEND_ENGINE_2
 #ifdef HTTP_HAVE_CURL
 
+HTTP_DECLARE_ARG_PASS_INFO();
+
 #define http_requestpool_object_declare_default_properties() _http_requestpool_object_declare_default_properties(TSRMLS_C)
 static inline void _http_requestpool_object_declare_default_properties(TSRMLS_D);
 
 zend_class_entry *http_requestpool_object_ce;
 zend_function_entry http_requestpool_object_fe[] = {
-       PHP_ME(HttpRequestPool, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(HttpRequestPool, __construct, http_arg_pass_ref_all, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
        PHP_ME(HttpRequestPool, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
        PHP_ME(HttpRequestPool, attach, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequestPool, detach, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequestPool, send, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequestPool, reset, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HttpRequestPool, socketSend, NULL, ZEND_ACC_PROTECTED)
+       PHP_ME(HttpRequestPool, socketSelect, NULL, ZEND_ACC_PROTECTED)
+       PHP_ME(HttpRequestPool, socketRead, NULL, ZEND_ACC_PROTECTED)
 
        {NULL, NULL, NULL}
 };
@@ -95,17 +102,6 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
        efree(o);
 }
 
-static void http_requestpool_object_ondestructhandler(zval **request, http_request_pool *pool TSRMLS_DC)
-{
-       http_request_pool_detach(pool, *request);
-}
-
-void _http_requestpool_object_ondestruct(http_request_pool *pool TSRMLS_DC)
-{
-       zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_requestpool_object_ondestructhandler, pool TSRMLS_CC);
-}
-
-
 #endif /* HTTP_HAVE_CURL */
 #endif /* ZEND_ENGINE_2 */