X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=cf8421848b4a55ae6f0eabde2361d8d27938f131;hp=48cf18c4a8cc76f1af29c3f59fb76eb055f6a161;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=f2d0dbf38d7b00455d3dfba8f2de087105ae0f35 diff --git a/http_request_pool_api.c b/http_request_pool_api.c index 48cf18c..cf84218 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.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 | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #define HTTP_WANT_CURL #include "php_http.h" @@ -32,13 +28,10 @@ # define HTTP_DEBUG_REQPOOLS 0 #endif -ZEND_EXTERN_MODULE_GLOBALS(http); - #ifndef HAVE_CURL_MULTI_STRERROR # define curl_multi_strerror(dummy) "unknown error" #endif -static void http_request_pool_freebody(http_request_callback_ctx **body); static int http_request_pool_compare_handles(void *h1, void *h2); /* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */ @@ -66,7 +59,6 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool pool->unfinished = 0; zend_llist_init(&pool->finished, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); - zend_llist_init(&pool->bodies, sizeof(http_request_callback_ctx *), (llist_dtor_func_t) http_request_pool_freebody, 0); #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Initialized request pool %p\n", pool); @@ -87,32 +79,24 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req if (req->pool) { http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is already member of %s HttpRequestPool", Z_OBJ_HANDLE_P(request), req->pool == pool ? "this" : "another"); + } else if (SUCCESS != http_request_object_requesthandler(req, request)) { + http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object for attaching to the HttpRequestPool"); } else { - http_request_callback_ctx *body = http_request_callback_data_ex(http_request_body_new(), 0); + CURLMcode code = curl_multi_add_handle(pool->ch, req->request->ch); - if (SUCCESS != http_request_pool_requesthandler(request, body->data)) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object for attaching to the HttpRequestPool"); + if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != code)) { + http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code)); } else { - CURLMcode code = curl_multi_add_handle(pool->ch, req->ch); - - if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != code)) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code)); - } else { - req->pool = pool; + req->pool = pool; - zend_llist_add_element(&pool->handles, &request); - zend_llist_add_element(&pool->bodies, &body); - - ZVAL_ADDREF(request); + ZVAL_ADDREF(request); + zend_llist_add_element(&pool->handles, &request); #if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); + fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); #endif - return SUCCESS; - } + return SUCCESS; } - efree(body->data); - efree(body); } return FAILURE; } @@ -135,7 +119,7 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req #endif } else if (req->pool != pool) { http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request)); - } else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) { + } else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->request->ch))) { http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code)); } else { req->pool = NULL; @@ -186,13 +170,6 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D } efree(handles); } - -#if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Destroying %d request bodies of pool %p\n", zend_llist_count(&pool->bodies), pool); -#endif - - /* free created bodies too */ - zend_llist_clean(&pool->bodies); } /* {{{ STATUS http_request_pool_send(http_request_pool *) */ @@ -231,7 +208,6 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) pool->unfinished = 0; zend_llist_clean(&pool->finished); zend_llist_clean(&pool->handles); - zend_llist_clean(&pool->bodies); curl_multi_cleanup(pool->ch); } /* }}} */ @@ -274,7 +250,9 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC) if (CURLMSG_DONE == msg->msg) { if (CURLE_OK != msg->data.result) { http_request_pool_try { - http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result)); + http_request *r = NULL; + curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &r); + http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), r?r->_error:"", r?r->url:""); } http_request_pool_catch(); } http_request_pool_try { @@ -288,24 +266,12 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC) } /* }}} */ -/* {{{ STATUS http_request_pool_requesthandler(zval *, http_request_body *) */ -STATUS _http_request_pool_requesthandler(zval *request, http_request_body *body TSRMLS_DC) -{ - getObjectEx(http_request_object, req, request); - if (SUCCESS == http_request_object_requesthandler(req, request, body)) { - http_request_conv(req->ch, &req->response, &req->request); - return SUCCESS; - } - return FAILURE; -} -/* }}} */ - /* {{{ void http_request_pool_responsehandler(zval **) */ void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC) { getObjectEx(http_request_object, obj, *req); - if (obj->ch == ch) { + if (obj->request->ch == ch) { #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool); @@ -323,11 +289,11 @@ static void move_backtrace_args(zval *from, zval *to TSRMLS_DC) zval **args, **trace_0, *old_trace_0, *trace = NULL; if ((trace = zend_read_property(zend_exception_get_default(), from, "trace", lenof("trace"), 0 TSRMLS_CC))) { - if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) { + if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) { old_trace_0 = *trace_0; - if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void **) &args)) { + if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void *) &args)) { if ((trace = zend_read_property(zend_exception_get_default(), to, "trace", lenof("trace"), 0 TSRMLS_CC))) { - if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) { + if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) { ZVAL_ADDREF(*args); add_assoc_zval(*trace_0, "args", *args); zend_hash_del(Z_ARRVAL_P(old_trace_0), "args", sizeof("args")); @@ -345,14 +311,17 @@ void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception /* if old_exception is already an HttpRequestPoolException append the new one, else create a new HttpRequestPoolException and append the old and new exceptions */ if (old_exception && Z_OBJCE_P(old_exception) == ce) { - zval *exprop; - - exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC); - SEP_PROP(&exprop); - convert_to_array(exprop); + zval *old_exprop, *new_exprop; - add_next_index_zval(exprop, new_exception); - zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC); + MAKE_STD_ZVAL(new_exprop); + array_init(new_exprop); + old_exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC); + if (Z_TYPE_P(old_exprop) == IS_ARRAY) { + array_copy(old_exprop, new_exprop); + } + add_next_index_zval(new_exprop, new_exception); + zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), new_exprop TSRMLS_CC); + zval_ptr_dtor(&new_exprop); EG(exception) = old_exception; } else if (new_exception && Z_OBJCE_P(new_exception) != ce){ @@ -380,15 +349,6 @@ void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception /*#*/ -/* {{{ static void http_request_pool_freebody(http_request_ctx **) */ -static void http_request_pool_freebody(http_request_callback_ctx **body) -{ - HTTP_REQUEST_CALLBACK_DATA(*body, http_request_body *, b); - http_request_body_free(b); - efree(*body); -} -/* }}} */ - /* {{{ static int http_request_pool_compare_handles(void *, void *) */ static int http_request_pool_compare_handles(void *h1, void *h2) {