X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=cf8421848b4a55ae6f0eabde2361d8d27938f131;hp=191ab446d2e763597c51a2565dbc243ae6e60c12;hb=e37040ebf8a470c77c7ae3498ee582ca20db259c;hpb=33b7c5dcd9cffebb8486cb57e04958e34bbfe662 diff --git a/http_request_pool_api.c b/http_request_pool_api.c index 191ab44..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,8 +28,6 @@ # define HTTP_DEBUG_REQPOOLS 0 #endif -ZEND_EXTERN_MODULE_GLOBALS(http); - #ifndef HAVE_CURL_MULTI_STRERROR # define curl_multi_strerror(dummy) "unknown error" #endif @@ -88,7 +82,7 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req } 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 { - CURLMcode code = curl_multi_add_handle(pool->ch, req->request.ch); + CURLMcode code = curl_multi_add_handle(pool->ch, req->request->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)); @@ -125,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->request.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; @@ -256,9 +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 { - char *url = NULL; - curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &url); - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s (%s)", curl_easy_strerror(msg->data.result), url); + 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 { @@ -277,7 +271,7 @@ void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC) { getObjectEx(http_request_object, obj, *req); - if (obj->request.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); @@ -295,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")); @@ -317,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; + zval *old_exprop, *new_exprop; - exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC); - SEP_PROP(&exprop); - convert_to_array(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){