projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- disallow detaching requests while executing progress callbacks
[m6w6/ext-http]
/
http_requestpool_object.c
diff --git
a/http_requestpool_object.c
b/http_requestpool_object.c
index 4ca9de76725fdc877279c8aac222e4a065dacc2d..69c3f9616a0ade832514f9e38e153d90d61c2655 100644
(file)
--- a/
http_requestpool_object.c
+++ b/
http_requestpool_object.c
@@
-134,12
+134,8
@@
void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
{
http_requestpool_object *o = (http_requestpool_object *) object;
{
http_requestpool_object *o = (http_requestpool_object *) object;
- if (OBJ_PROP(o)) {
- zend_hash_destroy(OBJ_PROP(o));
- FREE_HASHTABLE(OBJ_PROP(o));
- }
http_request_pool_dtor(&o->pool);
http_request_pool_dtor(&o->pool);
-
efree
(o);
+
freeObject
(o);
}
#define http_requestpool_object_llist2array _http_requestpool_object_llist2array
}
#define http_requestpool_object_llist2array _http_requestpool_object_llist2array
@@
-198,15
+194,13
@@
PHP_METHOD(HttpRequestPool, __construct)
for (i = 0; i < argc; ++i) {
if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
for (i = 0; i < argc; ++i) {
if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
- http_request_pool_try {
- http_request_pool_attach(&obj->pool, *(argv[i]));
- } http_request_pool_catch();
+ http_request_pool_attach(&obj->pool, *(argv[i]));
}
}
}
}
- http_request_pool_final();
}
efree(argv);
SET_EH_NORMAL();
}
efree(argv);
SET_EH_NORMAL();
+ http_final(HTTP_EX_CE(request_pool));
}
/* }}} */
}
/* }}} */
@@
-315,6
+309,9
@@
PHP_METHOD(HttpRequestPool, send)
SET_EH_THROW_HTTP();
status = http_request_pool_send(&obj->pool);
SET_EH_NORMAL();
SET_EH_THROW_HTTP();
status = http_request_pool_send(&obj->pool);
SET_EH_NORMAL();
+
+ /* rethrow as HttpRequestPoolException */
+ http_final(HTTP_EX_CE(request_pool));
RETURN_SUCCESS(status);
}
RETURN_SUCCESS(status);
}
@@
-391,7
+388,7
@@
PHP_METHOD(HttpRequestPool, valid)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
getObject(http_requestpool_object, obj);
RETURN_BOOL(obj->iterator.pos >= 0 && obj->iterator.pos < zend_llist_count(&obj->pool.handles));
}
getObject(http_requestpool_object, obj);
RETURN_BOOL(obj->iterator.pos >= 0 && obj->iterator.pos < zend_llist_count(&obj->pool.handles));
}
@@
-406,7
+403,7
@@
PHP_METHOD(HttpRequestPool, current)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
long pos = 0;
zval **current = NULL;
zend_llist_position lpos;
long pos = 0;
zval **current = NULL;
zend_llist_position lpos;
@@
-433,7
+430,7
@@
PHP_METHOD(HttpRequestPool, key)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
getObject(http_requestpool_object, obj);
RETURN_LONG(obj->iterator.pos);
}
getObject(http_requestpool_object, obj);
RETURN_LONG(obj->iterator.pos);
}