# you better don't look inside
authorMichael Wallner <mike@php.net>
Thu, 1 Dec 2005 16:14:54 +0000 (16:14 +0000)
committerMichael Wallner <mike@php.net>
Thu, 1 Dec 2005 16:14:54 +0000 (16:14 +0000)
http_exception_object.c
http_request_pool_api.c
http_requestpool_object.c
php_http_request_pool_api.h

index 60966a9..06b0c58 100644 (file)
@@ -53,7 +53,7 @@ PHP_MINIT_FUNCTION(http_exception_object)
        HTTP_REGISTER_EXCEPTION(HttpResponseException, HTTP_EX_CE(response), HTTP_EX_DEF_CE);
        HTTP_REGISTER_EXCEPTION(HttpUrlException, HTTP_EX_CE(url), HTTP_EX_DEF_CE);
        
        HTTP_REGISTER_EXCEPTION(HttpResponseException, HTTP_EX_CE(response), HTTP_EX_DEF_CE);
        HTTP_REGISTER_EXCEPTION(HttpUrlException, HTTP_EX_CE(url), HTTP_EX_DEF_CE);
        
-       zend_declare_property_null(HTTP_EX_CE(request_pool), "requestExceptions", sizeof("requestExceptions")-1, ZEND_ACC_PUBLIC TSRMLS_CC);
+       zend_declare_property_null(HTTP_EX_CE(request_pool), "exceptionStack", lenof("exceptionStack"), ZEND_ACC_PUBLIC TSRMLS_CC);
 
        HTTP_LONG_CONSTANT("HTTP_E_RUNTIME", HTTP_E_RUNTIME);
        HTTP_LONG_CONSTANT("HTTP_E_INVALID_PARAM", HTTP_E_INVALID_PARAM);
 
        HTTP_LONG_CONSTANT("HTTP_E_RUNTIME", HTTP_E_RUNTIME);
        HTTP_LONG_CONSTANT("HTTP_E_INVALID_PARAM", HTTP_E_INVALID_PARAM);
index 33a498c..48cf18c 100644 (file)
@@ -38,8 +38,6 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #      define curl_multi_strerror(dummy) "unknown error"
 #endif
 
 #      define curl_multi_strerror(dummy) "unknown error"
 #endif
 
-#define http_request_pool_wrap_exception(o, n) _http_request_pool_wrap_exception((o), (n) TSRMLS_CC)
-static inline void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception TSRMLS_DC);
 static void http_request_pool_freebody(http_request_callback_ctx **body);
 static int http_request_pool_compare_handles(void *h1, void *h2);
 
 static void http_request_pool_freebody(http_request_callback_ctx **body);
 static int http_request_pool_compare_handles(void *h1, void *h2);
 
@@ -264,18 +262,6 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 }
 /* }}} */
 
 }
 /* }}} */
 
-#define http_request_pool_try \
-       { \
-               zval *old_exception = EG(exception); \
-               EG(exception) = NULL;
-#define http_request_pool_catch \
-               if (EG(exception)) { \
-                       http_request_pool_wrap_exception(old_exception, EG(exception)); \
-               } else { \
-                       EG(exception) = old_exception; \
-               } \
-       }
-
 /* {{{ int http_request_pool_perform(http_request_pool *) */
 PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
 {
 /* {{{ int http_request_pool_perform(http_request_pool *) */
 PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
 {
@@ -289,22 +275,14 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
                        if (CURLE_OK != msg->data.result) {
                                http_request_pool_try {
                                        http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));
                        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_pool_catch;
+                               } http_request_pool_catch();
                        }
                        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_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_catch();
                }
        }
                }
        }
-       if (EG(exception)) {
-               zval *exception;
-               
-               http_request_pool_wrap_exception(NULL, EG(exception));
-               
-               exception = EG(exception);
-               EG(exception) = NULL;
-               zend_throw_exception_object(exception TSRMLS_CC);
-       }
+       http_request_pool_final();
        
        return pool->unfinished;
 }
        
        return pool->unfinished;
 }
@@ -340,10 +318,27 @@ void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC)
 }
 /* }}} */
 
 }
 /* }}} */
 
-/*#*/
-
-/* {{{ static void http_request_pool_wrap_exception(zval *, zval *) */
-static inline void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception 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);
        
 {
        zend_class_entry *ce = HTTP_EX_CE(request_pool);
        
@@ -352,12 +347,12 @@ static inline void _http_request_pool_wrap_exception(zval *old_exception, zval *
        if (old_exception && Z_OBJCE_P(old_exception) == ce) {
                zval *exprop;
                
        if (old_exception && Z_OBJCE_P(old_exception) == ce) {
                zval *exprop;
                
-               exprop = zend_read_property(ce, old_exception, "requestExceptions", sizeof("requestExceptions")-1, 0 TSRMLS_CC);
+               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);
                SEP_PROP(&exprop);
                convert_to_array(exprop);
                
                add_next_index_zval(exprop, new_exception);
-               zend_update_property(ce, old_exception, "requestExceptions", sizeof("requestExceptions")-1, exprop TSRMLS_CC);
+               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){
                
                EG(exception) = old_exception;
        } else if (new_exception && Z_OBJCE_P(new_exception) != ce){
@@ -371,8 +366,11 @@ static inline void _http_request_pool_wrap_exception(zval *old_exception, zval *
                if (old_exception) {
                        add_next_index_zval(exprop, old_exception);
                }
                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);
                add_next_index_zval(exprop, new_exception);
-               zend_update_property(ce, exval, "requestExceptions", sizeof("requestExceptions")-1, exprop TSRMLS_CC);
+               zend_update_property(ce, exval, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC);
                zval_ptr_dtor(&exprop);
                
                EG(exception) = exval;
                zval_ptr_dtor(&exprop);
                
                EG(exception) = exval;
@@ -380,6 +378,8 @@ static inline void _http_request_pool_wrap_exception(zval *old_exception, zval *
 }
 /* }}} */
 
 }
 /* }}} */
 
+/*#*/
+
 /* {{{ static void http_request_pool_freebody(http_request_ctx **) */
 static void http_request_pool_freebody(http_request_callback_ctx **body)
 {
 /* {{{ static void http_request_pool_freebody(http_request_ctx **) */
 static void http_request_pool_freebody(http_request_callback_ctx **body)
 {
index 3a0c020..902574d 100644 (file)
@@ -175,7 +175,7 @@ static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_
  * Accepts virtual infinite optional parameters each referencing an
  * HttpRequest object.
  * 
  * Accepts virtual infinite optional parameters each referencing an
  * HttpRequest object.
  * 
- * Throws HttpRequestException, HttpRequestPoolException, HttpInvalidParamException.
+ * Throws HttpRequestPoolException (HttpRequestException, HttpInvalidParamException).
  * 
  * Example:
  * <pre>
  * 
  * Example:
  * <pre>
@@ -205,16 +205,21 @@ PHP_METHOD(HttpRequestPool, __construct)
        zval ***argv = safe_emalloc(argc, sizeof(zval *), 0);
        getObject(http_requestpool_object, obj);
 
        zval ***argv = safe_emalloc(argc, sizeof(zval *), 0);
        getObject(http_requestpool_object, obj);
 
+       SET_EH_THROW_HTTP();
        if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) {
                int i;
 
                for (i = 0; i < argc; ++i) {
                        if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
        if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) {
                int i;
 
                for (i = 0; i < argc; ++i) {
                        if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
-                               http_request_pool_attach(&obj->pool, *(argv[i]));
+                               http_request_pool_try {
+                                       http_request_pool_attach(&obj->pool, *(argv[i]));
+                               } http_request_pool_catch();
                        }
                }
                        }
                }
+               http_request_pool_final();
        }
        efree(argv);
        }
        efree(argv);
+       SET_EH_NORMAL();
 }
 /* }}} */
 
 }
 /* }}} */
 
@@ -311,8 +316,7 @@ PHP_METHOD(HttpRequestPool, detach)
  * 
  * Returns TRUE on success, or FALSE on failure.
  * 
  * 
  * Returns TRUE on success, or FALSE on failure.
  * 
- * Throws HttpSocketException, HttpRequestException, 
- * HttpRequestPoolException, HttpMalformedHeaderException.
+ * Throws HttpRequestPoolException (HttpSocketException, HttpRequestException, HttpMalformedHeaderException).
  */
 PHP_METHOD(HttpRequestPool, send)
 {
  */
 PHP_METHOD(HttpRequestPool, send)
 {
index d1ab0b3..1ae2056 100644 (file)
@@ -29,6 +29,30 @@ extern void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC);
 #define http_request_pool_requesthandler(r, b) _http_request_pool_requesthandler((r), (b) TSRMLS_CC)
 extern STATUS _http_request_pool_requesthandler(zval *request, http_request_body *body TSRMLS_DC);
 
 #define http_request_pool_requesthandler(r, b) _http_request_pool_requesthandler((r), (b) TSRMLS_CC)
 extern STATUS _http_request_pool_requesthandler(zval *request, http_request_body *body TSRMLS_DC);
 
+#define http_request_pool_try \
+       { \
+               zval *old_exception = EG(exception); \
+               EG(exception) = NULL;
+#define http_request_pool_catch() \
+               if (EG(exception)) { \
+                       http_request_pool_wrap_exception(old_exception, EG(exception)); \
+               } else { \
+                       EG(exception) = old_exception; \
+               } \
+       }
+#define http_request_pool_final() \
+       if (EG(exception)) { \
+               zval *exception; \
+               http_request_pool_wrap_exception(NULL, EG(exception)); \
+               exception = EG(exception); \
+               EG(exception) = NULL; \
+               zend_throw_exception_object(exception TSRMLS_CC); \
+       }
+
+#define http_request_pool_wrap_exception(o, n) _http_request_pool_wrap_exception((o), (n) TSRMLS_CC)
+extern void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception TSRMLS_DC);
+
+
 #define http_request_pool_init(p) _http_request_pool_init((p) TSRMLS_CC)
 PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC);
 
 #define http_request_pool_init(p) _http_request_pool_init((p) TSRMLS_CC)
 PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC);