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

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 902574d..30bfbde 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"
 
@@ -39,7 +35,7 @@ extern PHPAPI zend_class_entry *spl_ce_Countable;
 #define HTTP_EMPTY_ARGS(method, ret_ref)	HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, ret_ref)
 #define HTTP_REQPOOL_ME(method, visibility)	PHP_ME(HttpRequestPool, method, HTTP_ARGS(HttpRequestPool, method), visibility)
 
-HTTP_BEGIN_ARGS_AR(HttpRequestPool, __construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
 	HTTP_ARG_OBJ(HttpRequest, request0, 0)
 	HTTP_ARG_OBJ(HttpRequest, request1, 0)
 	HTTP_ARG_OBJ(HttpRequest, requestN, 0)
@@ -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.
@@ -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();