- fix SEGV when there's an exception in HttpRequest::onFinish()

[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..aff9c1eebcf2d81465052f796be5d3c78c3df6e1 100644 (file)
--- a/php_http_request_pool_api.h
+++ b/php_http_request_pool_api.h
@@ -23,32 +23,11 @@ typedef struct _http_request_pool_t {
        int unfinished;
 } http_request_pool;
 
-#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);
+typedef int (*http_request_pool_apply_func)(http_request_pool *pool, zval *request TSRMLS_DC);
+typedef int (*http_request_pool_apply_with_arg_func)(http_request_pool *pool, zval *request, void *arg TSRMLS_DC);
 
+#define http_request_pool_responsehandler(p, r, c) _http_request_pool_responsehandler((p), (r), (c) TSRMLS_CC)
+extern int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void *ch 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);
@@ -59,6 +38,12 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 #define http_request_pool_detach(p, r) _http_request_pool_detach((p), (r) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC);
 
+#define http_request_pool_apply(p, f) _http_request_pool_apply((p), (f) TSRMLS_CC)
+PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb TSRMLS_DC);
+
+#define http_request_pool_apply_with_arg(p, f, a) _http_request_pool_apply_with_arg((p), (f), (a) TSRMLS_CC)
+PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg TSRMLS_DC);
+
 #define http_request_pool_detach_all(p) _http_request_pool_detach_all((p) TSRMLS_CC)
 PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC);