X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestpool_object.c;h=902574dc9255198f39238a8ff42e9309b5d983df;hp=cbbd6f0fb9164f3d229e7b24a241e0d27863215e;hb=f2d0dbf38d7b00455d3dfba8f2de087105ae0f35;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index cbbd6f0..902574d 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -12,27 +12,28 @@
 
 /* $Id$ */
 
-
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
 
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
-#include "php_http_std_defs.h"
+#include "zend_interfaces.h"
+
 #include "php_http_api.h"
-#include "php_http_requestpool_object.h"
-#include "php_http_request_pool_api.h"
-#include "php_http_request_object.h"
 #include "php_http_exception_object.h"
+#include "php_http_request_api.h"
+#include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
+#include "php_http_requestpool_object.h"
 
-#include "zend_interfaces.h"
-
-#ifdef PHP_WIN32
-#	include <winsock2.h>
+#if defined(HAVE_SPL) && !defined(WONKY)
+/* SPL doesn't install its headers */
+extern PHPAPI zend_class_entry *spl_ce_Countable;
 #endif
-#include <curl/curl.h>
 
 #define HTTP_BEGIN_ARGS(method, req_args) 	HTTP_BEGIN_ARGS_EX(HttpRequestPool, method, 0, req_args)
 #define HTTP_EMPTY_ARGS(method, ret_ref)	HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, ret_ref)
@@ -65,6 +66,8 @@ HTTP_EMPTY_ARGS(key, 0);
 HTTP_EMPTY_ARGS(next, 0);
 HTTP_EMPTY_ARGS(rewind, 0);
 
+HTTP_EMPTY_ARGS(count, 0);
+
 HTTP_EMPTY_ARGS(getAttachedRequests, 0);
 HTTP_EMPTY_ARGS(getFinishedRequests, 0);
 
@@ -90,6 +93,9 @@ zend_function_entry http_requestpool_object_fe[] = {
 	HTTP_REQPOOL_ME(next, ZEND_ACC_PUBLIC)
 	HTTP_REQPOOL_ME(rewind, ZEND_ACC_PUBLIC)
 	
+	/* implmenents Countable */
+	HTTP_REQPOOL_ME(count, ZEND_ACC_PUBLIC)
+	
 	HTTP_REQPOOL_ME(getAttachedRequests, ZEND_ACC_PUBLIC)
 	HTTP_REQPOOL_ME(getFinishedRequests, ZEND_ACC_PUBLIC)
 
@@ -100,7 +106,13 @@ static zend_object_handlers http_requestpool_object_handlers;
 PHP_MINIT_FUNCTION(http_requestpool_object)
 {
 	HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
+#if defined(HAVE_SPL) && !defined(WONKY)
+	zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable, zend_ce_iterator);
+#else
 	zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator);
+#endif
+
+	http_requestpool_object_handlers.clone_obj = NULL;
 	return SUCCESS;
 }
 
@@ -147,7 +159,6 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
 static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_DC)
 {
 	ZVAL_ADDREF(*req);
-	Z_OBJ_ADDREF_PP(req);
 	add_next_index_zval(array, *req);
 }
 
@@ -164,7 +175,7 @@ static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_
  * Accepts virtual infinite optional parameters each referencing an
  * HttpRequest object.
  * 
- * Throws HttpRequestException, HttpRequestPoolException, HttpInvalidParamException.
+ * Throws HttpRequestPoolException (HttpRequestException, HttpInvalidParamException).
  * 
  * Example:
  * <pre>
@@ -194,16 +205,21 @@ PHP_METHOD(HttpRequestPool, __construct)
 	zval ***argv = safe_emalloc(argc, sizeof(zval *), 0);
 	getObject(http_requestpool_object, obj);
 
+	SET_EH_THROW_HTTP();
 	if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) {
 		int i;
 
 		for (i = 0; i < argc; ++i) {
 			if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
-				http_request_pool_attach(&obj->pool, *(argv[i]));
+				http_request_pool_try {
+					http_request_pool_attach(&obj->pool, *(argv[i]));
+				} http_request_pool_catch();
 			}
 		}
+		http_request_pool_final();
 	}
 	efree(argv);
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -300,8 +316,7 @@ PHP_METHOD(HttpRequestPool, detach)
  * 
  * Returns TRUE on success, or FALSE on failure.
  * 
- * Throws HttpSocketException, HttpRequestException, 
- * HttpRequestPoolException, HttpMalformedHeaderException.
+ * Throws HttpRequestPoolException (HttpSocketException, HttpRequestException, HttpMalformedHeaderException).
  */
 PHP_METHOD(HttpRequestPool, send)
 {
@@ -464,6 +479,21 @@ PHP_METHOD(HttpRequestPool, rewind)
 }
 /* }}} */
 
+/* {{{ proto int HttpRequestPool::count()
+ *
+ * Implements Countable.
+ * 
+ * Returns the number of attached HttpRequest objects.
+ */
+PHP_METHOD(HttpRequestPool, count)
+{
+	NO_ARGS {
+		getObject(http_requestpool_object, obj);
+		RETURN_LONG((long) zend_llist_count(&obj->pool.handles));
+	}
+}
+/* }}} */
+
 /* {{{ proto array HttpRequestPool::getAttachedRequests()
  *
  * Get attached HttpRequest objects.