X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_pool_api.h;h=986c9ed0b7df954bea531bd9779dc7474ab6a74d;hp=ead52dda7d4e035e7f70048c3635cbb9e8d47a91;hb=d650022122969644c33bd03a552af1a631429e16;hpb=aa931f5b858c3d8513e883ae913f0704557ca540

diff --git a/php_http_request_pool_api.h b/php_http_request_pool_api.h
index ead52dd..986c9ed 100644
--- a/php_http_request_pool_api.h
+++ b/php_http_request_pool_api.h
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -19,28 +16,39 @@
 #define PHP_HTTP_REQUEST_POOL_API_H
 #ifdef HTTP_HAVE_CURL
 
-#include "php_http_std_defs.h"
-#include "php_http_request_api.h"
-#include "phpstr/phpstr.h"
-
-#ifdef PHP_WIN32
-#	include <winsock2.h>
-#endif
-
-#include <curl/curl.h>
-
 typedef struct {
 	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);