X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestpool_object.c;h=06733d2adbd918090ddef4f2559217608cead609;hp=c0ae1357d3e9ca9126a11907faaff40af9c951b4;hb=8ae4de63a85ad21442948aa35f45e28368c91929;hpb=f1df16d07b48a2561ec8c3065e094f3f17c09889

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index c0ae135..06733d2 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | 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-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -31,6 +28,10 @@
 #include "php_http_exception_object.h"
 
 #include "zend_interfaces.h"
+#if defined(HAVE_SPL) && !defined(WONKY)
+#	include "ext/spl/spl_array.h"
+#	include "ext/spl/spl_iterators.h"
+#endif
 
 #ifdef PHP_WIN32
 #	include <winsock2.h>
@@ -68,6 +69,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);
 
@@ -93,6 +96,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)
 
@@ -103,7 +109,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, spl_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;
 }
 
@@ -149,8 +161,7 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
 #define http_requestpool_object_llist2array _http_requestpool_object_llist2array
 static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_DC)
 {
-	zval_add_ref(req);
-	Z_OBJ_ADDREF_PP(req);
+	ZVAL_ADDREF(*req);
 	add_next_index_zval(array, *req);
 }
 
@@ -333,20 +344,20 @@ PHP_METHOD(HttpRequestPool, send)
  *     public function send()
  *     {
  *         while ($this->socketPerform()) {
- *             $this->handleRequests();
  *             if (!$this->socketSelect()) {
  *                 throw new HttpSocketExcpetion;
  *             }
  *         }
- *         $this->handleRequests();
  *     }
  *     
- *     private function handleRequests()
+ *     protected final function socketPerform()
  *     {
+ *         $result = parent::socketPerform();
  *         foreach ($this->getFinishedRequests() as $r) {
  *             $this->detach($r);
  *             // handle response of finished request
  *         }
+ *         return $result;
  *     }
  * } 
  * ?>
@@ -467,6 +478,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.