| 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"
# define HTTP_DEBUG_REQPOOLS 0
#endif
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
#ifndef HAVE_CURL_MULTI_STRERROR
# define curl_multi_strerror(dummy) "unknown error"
#endif
} 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));
#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;
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 {
{
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);
}
/* }}} */
-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)) {
- 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 *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);
-
- 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 *) */
projects / m6w6 / ext-http / blobdiff