X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestpool_object.c;h=2f1b4175cfaf1d9ed1fc770c42f3053bd25b6948;hp=09fc261045cbeac4469f52641b3c14921553daa2;hb=902d195a198f4976c8ff081a95cdd3e315c14f5f;hpb=76a1064dde808801f4988df89521a323661742aa

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 09fc261..2f1b417 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -19,32 +19,36 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
-#ifdef HTTP_HAVE_CURL
-#	ifdef PHP_WIN32
-#		include <winsock2.h>
-#	endif
-#	include <curl/curl.h>
-#endif
-
 #include "php.h"
 
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+
 #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
+#ifdef PHP_WIN32
+#	include <winsock2.h>
+#endif
+#include <curl/curl.h>
+
+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}
 };
@@ -90,14 +94,11 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
 		zend_hash_destroy(OBJ_PROP(o));
 		FREE_HASHTABLE(OBJ_PROP(o));
 	}
-	if (o->pool.ch) {
-		curl_multi_cleanup(o->pool.ch);
-	}
+	http_request_pool_dtor(&o->pool);
 	efree(o);
 }
 
-#endif /* HTTP_HAVE_CURL */
-#endif /* ZEND_ENGINE_2 */
+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
 
 /*
  * Local variables: