| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#define HTTP_WANT_CURL
#include "php_http.h"
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
#include "php_http_api.h"
+#include "php_http_exception_object.h"
#include "php_http_request_api.h"
#include "php_http_request_object.h"
#include "php_http_request_pool_api.h"
# 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 *) */
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);
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;
-
- zend_llist_add_element(&pool->handles, &request);
- zend_llist_add_element(&pool->bodies, &body);
+ req->pool = pool;
- 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;
}
#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;
}
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 *) */
pool->unfinished = 0;
zend_llist_clean(&pool->finished);
zend_llist_clean(&pool->handles);
- zend_llist_clean(&pool->bodies);
curl_multi_cleanup(pool->ch);
}
/* }}} */
while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
if (CURLMSG_DONE == msg->msg) {
if (CURLE_OK != msg->data.result) {
- http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));
+ http_request_pool_try {
+ 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();
}
- zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC);
+ http_request_pool_try {
+ zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC);
+ } http_request_pool_catch();
}
}
+ http_request_pool_final();
return pool->unfinished;
}
/* }}} */
-/* {{{ 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);
}
/* }}} */
-/*#*/
-
-/* {{{ static void http_request_pool_freebody(http_request_ctx **) */
-static void http_request_pool_freebody(http_request_callback_ctx **body)
+static void move_backtrace_args(zval *from, zval *to TSRMLS_DC)
{
- HTTP_REQUEST_CALLBACK_DATA(*body, http_request_body *, b);
- http_request_body_free(b);
- efree(*body);
+ 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)) {
+ old_trace_0 = *trace_0;
+ 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)) {
+ ZVAL_ADDREF(*args);
+ add_assoc_zval(*trace_0, "args", *args);
+ zend_hash_del(Z_ARRVAL_P(old_trace_0), "args", sizeof("args"));
+ }
+ }
+ }
+ }
+ }
+}
+/* {{{ void http_request_pool_wrap_exception(zval *, zval *) */
+void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception TSRMLS_DC)
+{
+ zend_class_entry *ce = HTTP_EX_CE(request_pool);
+
+ /* 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 *old_exprop, *new_exprop;
+
+ 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){
+ zval *exval, *exprop;
+
+ MAKE_STD_ZVAL(exval);
+ object_init_ex(exval, ce);
+ MAKE_STD_ZVAL(exprop);
+ array_init(exprop);
+
+ if (old_exception) {
+ add_next_index_zval(exprop, old_exception);
+ }
+ move_backtrace_args(new_exception, exval TSRMLS_CC);
+ zend_update_property_long(ce, exval, "code", lenof("code"), HTTP_E_REQUEST_POOL TSRMLS_CC);
+ zend_update_property_string(ce, exval, "message", lenof("message"), "See exceptionStack property" TSRMLS_CC);
+ add_next_index_zval(exprop, new_exception);
+ zend_update_property(ce, exval, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC);
+ zval_ptr_dtor(&exprop);
+
+ EG(exception) = exval;
+ }
}
/* }}} */
+/*#*/
+
/* {{{ static int http_request_pool_compare_handles(void *, void *) */
static int http_request_pool_compare_handles(void *h1, void *h2)
{
projects / m6w6 / ext-http / blobdiff