- adjust ini entry names to those of the globals struct

[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 d1ab0b3d1ce4b26087ebc1fd9a49bd6c75f09a88..79a3e4ef946111cb1ec3a7a98a0ca5f4e94b9e12 100644 (file)
--- a/php_http_request_pool_api.h
+++ b/php_http_request_pool_api.h
@@ -6,7 +6,7 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -16,18 +16,39 @@
 #define PHP_HTTP_REQUEST_POOL_API_H
 #ifdef HTTP_HAVE_CURL
 
-typedef struct {
+typedef struct _http_request_pool_t {
        CURLM *ch;
        zend_llist finished;
        zend_llist handles;
-       zend_llist bodies;
        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_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);