X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_requestpool_object.c;h=69c3f9616a0ade832514f9e38e153d90d61c2655;hb=868f439c22372956836fe7d561d2adc69feea809;hp=6ae9cd96443de98aa3e921ab3bf665d278846f07;hpb=c8dff7011092296f9fcc12e68ad8eef18b19cdf4;p=m6w6%2Fext-http

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 6ae9cd9..69c3f96 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -194,15 +194,13 @@ PHP_METHOD(HttpRequestPool, __construct)
 
 		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_try {
-					http_request_pool_attach(&obj->pool, *(argv[i]));
-				} http_request_pool_catch();
+				http_request_pool_attach(&obj->pool, *(argv[i]));
 			}
 		}
-		http_request_pool_final();
 	}
 	efree(argv);
 	SET_EH_NORMAL();
+	http_final(HTTP_EX_CE(request_pool));
 }
 /* }}} */
 
@@ -311,6 +309,9 @@ PHP_METHOD(HttpRequestPool, send)
 	SET_EH_THROW_HTTP();
 	status = http_request_pool_send(&obj->pool);
 	SET_EH_NORMAL();
+	
+	/* rethrow as HttpRequestPoolException */
+	http_final(HTTP_EX_CE(request_pool));
 
 	RETURN_SUCCESS(status);
 }