projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update docs
[m6w6/ext-http]
/
http_requestpool_object.c
diff --git
a/http_requestpool_object.c
b/http_requestpool_object.c
index 3a6d015fecc6f78f87a85235621ab021f2cc4263..30bfbdea405a0e8dafd3417f8ecc6893099ddf49 100644
(file)
--- 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. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-200
5
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-200
6
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#define HTTP_WANT_CURL
#include "php_http.h"
#define HTTP_WANT_CURL
#include "php_http.h"
@@
-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)
HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED)
HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED)
- /* implements I
n
terator */
+ /* implements Iterator */
HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(current, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(key, ZEND_ACC_PUBLIC)
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
* able to send several HttpRequests in parallel.
*
* WARNING: Don't attach/detach HttpRequest objects to the HttpRequestPool
- * object while you're using the implemented I
n
terator interface.
+ * object while you're using the implemented Iterator interface.
*
* Accepts virtual infinite optional parameters each referencing an
* HttpRequest object.
*
* 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) {
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();
}
}
RETURN_NULL();