- move some cruft of http_request_api.c to php_http_request_int.h

[m6w6/ext-http] / php_http_request_pool_api.h

diff --git a/php_http_request_pool_api.h b/php_http_request_pool_api.h
index 79a3e4ef946111cb1ec3a7a98a0ca5f4e94b9e12..19d9eb858378f20b0caf35bacabe4b578104025a 100644 (file)
--- a/php_http_request_pool_api.h
+++ b/php_http_request_pool_api.h
@@ -26,29 +26,9 @@ typedef struct _http_request_pool_t {
 #define http_request_pool_responsehandler _http_request_pool_responsehandler
 extern void _http_request_pool_responsehandler(zval **req, CURL *ch 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_try http_try
+#define http_request_pool_catch() http_catch(HTTP_EX_CE(request_pool))
+#define http_request_pool_final() http_final(HTTP_EX_CE(request_pool))
 
 #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);