# you better don't look inside

[m6w6/ext-http] / http_request_pool_api.c

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index c221f1ea0747ffe6a40e58309a4d4849b35e49fd..48cf18c4a8cc76f1af29c3f59fb76eb055f6a161 100644 (file)
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -15,16 +15,17 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
 
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
+#include "php_http_exception_object.h"
 #include "php_http_request_api.h"
-#include "php_http_request_pool_api.h"
 #include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
 #include "php_http_requestpool_object.h"
 
 #ifndef HTTP_DEBUG_REQPOOLS
@@ -272,11 +273,16 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
        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_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));
+                               } 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;
 }
@@ -312,6 +318,66 @@ void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC)
 }
 /* }}} */
 
+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 void http_request_pool_freebody(http_request_ctx **) */