projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix build with php-5.2
[m6w6/ext-http]
/
http_requestpool_object.c
diff --git
a/http_requestpool_object.c
b/http_requestpool_object.c
index 60c07486f52bf30adbba6e26e07749983a3b0adf..4ca9de76725fdc877279c8aac222e4a065dacc2d 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"
@@
-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)
#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)
#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_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)
HTTP_BEGIN_ARGS(attach, 1)
HTTP_ARG_OBJ(HttpRequest, request, 0)
@@
-56,23
+52,20
@@
HTTP_BEGIN_ARGS(detach, 1)
HTTP_ARG_OBJ(HttpRequest, request, 0)
HTTP_END_ARGS;
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(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(send);
+HTTP_EMPTY_ARGS(socketPerform);
+HTTP_EMPTY_ARGS(socketSelect);
-HTTP_EMPTY_ARGS(count, 0);
+HTTP_EMPTY_ARGS(valid);
+HTTP_EMPTY_ARGS(current);
+HTTP_EMPTY_ARGS(key);
+HTTP_EMPTY_ARGS(next);
+HTTP_EMPTY_ARGS(rewind);
-HTTP_EMPTY_ARGS(getAttachedRequests, 0);
-HTTP_EMPTY_ARGS(getFinishedRequests, 0);
+HTTP_EMPTY_ARGS(count);
-#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
);
+HTTP_EMPTY_ARGS(getAttachedRequests);
+
HTTP_EMPTY_ARGS(getFinishedRequests
);
zend_class_entry *http_requestpool_object_ce;
zend_function_entry http_requestpool_object_fe[] = {
zend_class_entry *http_requestpool_object_ce;
zend_function_entry http_requestpool_object_fe[] = {
@@
-106,13
+99,14
@@
static zend_object_handlers http_requestpool_object_handlers;
PHP_MINIT_FUNCTION(http_requestpool_object)
{
HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
PHP_MINIT_FUNCTION(http_requestpool_object)
{
HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
+ http_requestpool_object_handlers.clone_obj = NULL;
+
#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
#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;
}
return SUCCESS;
}
@@
-127,7
+121,7
@@
zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC)
http_request_pool_init(&o->pool);
ALLOC_HASHTABLE(OBJ_PROP(o));
http_request_pool_init(&o->pool);
ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o),
0
, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_init(OBJ_PROP(o),
zend_hash_num_elements(&ce->default_properties)
, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
ov.handle = putObject(http_requestpool_object, o);
zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
ov.handle = putObject(http_requestpool_object, o);
@@
-136,13
+130,6
@@
zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC)
return ov;
}
return ov;
}
-static inline void _http_requestpool_object_declare_default_properties(TSRMLS_D)
-{
- zend_class_entry *ce = http_requestpool_object_ce;
-
- DCL_PROP_N(PROTECTED, pool);
-}
-
void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
{
http_requestpool_object *o = (http_requestpool_object *) object;
void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
{
http_requestpool_object *o = (http_requestpool_object *) object;
@@
-256,7
+243,7
@@
PHP_METHOD(HttpRequestPool, reset)
* Attach an HttpRequest object to this HttpRequestPool.
* WARNING: set all options prior attaching!
*
* 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 alread
y
attached to
* antother HttpRequestPool object.
*
* Returns TRUE on success, or FALSE on failure.
* antother HttpRequestPool object.
*
* Returns TRUE on success, or FALSE on failure.
@@
-430,7
+417,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();