X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_requestpool_object.c;h=fed57219ac4ae05d98dce1c773f126f7236182fd;hb=7904ebbfd747d11f0821d2b2712600ab07a36ff6;hp=3a6d015fecc6f78f87a85235621ab021f2cc4263;hpb=1067e607effc3e617fb7841db359f576c71b9c08;p=m6w6%2Fext-http

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 3a6d015..fed5721 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -6,16 +6,12 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #define HTTP_WANT_CURL
 #include "php_http.h"
 
@@ -36,7 +32,7 @@ extern PHPAPI zend_class_entry *spl_ce_Countable;
 #endif
 
 #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)
+#define HTTP_EMPTY_ARGS(method)				HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, 0)
 #define HTTP_REQPOOL_ME(method, visibility)	PHP_ME(HttpRequestPool, method, HTTP_ARGS(HttpRequestPool, method), visibility)
 
 HTTP_BEGIN_ARGS(__construct, 0)
@@ -45,8 +41,8 @@ HTTP_BEGIN_ARGS(__construct, 0)
 	HTTP_ARG_OBJ(HttpRequest, requestN, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(__destruct, 0);
-HTTP_EMPTY_ARGS(reset, 0);
+HTTP_EMPTY_ARGS(__destruct);
+HTTP_EMPTY_ARGS(reset);
 
 HTTP_BEGIN_ARGS(attach, 1)
 	HTTP_ARG_OBJ(HttpRequest, request, 0)
@@ -56,20 +52,20 @@ HTTP_BEGIN_ARGS(detach, 1)
 	HTTP_ARG_OBJ(HttpRequest, request, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(send, 0);
-HTTP_EMPTY_ARGS(socketPerform, 0);
-HTTP_EMPTY_ARGS(socketSelect, 0);
+HTTP_EMPTY_ARGS(send);
+HTTP_EMPTY_ARGS(socketPerform);
+HTTP_EMPTY_ARGS(socketSelect);
 
-HTTP_EMPTY_ARGS(valid, 0);
-HTTP_EMPTY_ARGS(current, 1);
-HTTP_EMPTY_ARGS(key, 0);
-HTTP_EMPTY_ARGS(next, 0);
-HTTP_EMPTY_ARGS(rewind, 0);
+HTTP_EMPTY_ARGS(valid);
+HTTP_EMPTY_ARGS(current);
+HTTP_EMPTY_ARGS(key);
+HTTP_EMPTY_ARGS(next);
+HTTP_EMPTY_ARGS(rewind);
 
-HTTP_EMPTY_ARGS(count, 0);
+HTTP_EMPTY_ARGS(count);
 
-HTTP_EMPTY_ARGS(getAttachedRequests, 0);
-HTTP_EMPTY_ARGS(getFinishedRequests, 0);
+HTTP_EMPTY_ARGS(getAttachedRequests);
+HTTP_EMPTY_ARGS(getFinishedRequests);
 
 #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);
@@ -86,7 +82,7 @@ zend_function_entry http_requestpool_object_fe[] = {
 	HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED)
 	HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED)
 
-	/* implements Interator */
+	/* implements Iterator */
 	HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)
 	HTTP_REQPOOL_ME(current, ZEND_ACC_PUBLIC)
 	HTTP_REQPOOL_ME(key, ZEND_ACC_PUBLIC)
@@ -170,7 +166,7 @@ static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_
  * able to send several HttpRequests in parallel.
  * 
  * WARNING: Don't attach/detach HttpRequest objects to the HttpRequestPool
- * object while you're using the implemented Interator interface. 
+ * object while you're using the implemented Iterator interface. 
  *
  * Accepts virtual infinite optional parameters each referencing an
  * HttpRequest object.
@@ -256,7 +252,7 @@ PHP_METHOD(HttpRequestPool, reset)
  * Attach an HttpRequest object to this HttpRequestPool.
  * WARNING: set all options prior attaching!
  * 
- * Expects the parameter to be an HttpRequest object not alread attached to
+ * Expects the parameter to be an HttpRequest object not already attached to
  * antother HttpRequestPool object.
  * 
  * Returns TRUE on success, or FALSE on failure.
@@ -430,7 +426,7 @@ PHP_METHOD(HttpRequestPool, current)
 					current && obj->iterator.pos != pos++;
 					current = zend_llist_get_next_ex(&obj->pool.handles, &lpos));
 			if (current) {
-				RETURN_OBJECT(*current);
+				RETURN_OBJECT(*current, 1);
 			}
 		}
 		RETURN_NULL();