X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_requestpool_object.c;h=3a6d015fecc6f78f87a85235621ab021f2cc4263;hb=1067e607effc3e617fb7841db359f576c71b9c08;hp=3a0c0200af8cd46e5da65384739f35600ef52a32;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb;p=m6w6%2Fext-http diff --git a/http_requestpool_object.c b/http_requestpool_object.c index 3a0c020..3a6d015 100644 --- a/http_requestpool_object.c +++ b/http_requestpool_object.c @@ -39,7 +39,7 @@ extern PHPAPI zend_class_entry *spl_ce_Countable; #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, ret_ref) #define HTTP_REQPOOL_ME(method, visibility) PHP_ME(HttpRequestPool, method, HTTP_ARGS(HttpRequestPool, method), visibility) -HTTP_BEGIN_ARGS_AR(HttpRequestPool, __construct, 0, 0) +HTTP_BEGIN_ARGS(__construct, 0) HTTP_ARG_OBJ(HttpRequest, request0, 0) HTTP_ARG_OBJ(HttpRequest, request1, 0) HTTP_ARG_OBJ(HttpRequest, requestN, 0) @@ -175,7 +175,7 @@ static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_ * Accepts virtual infinite optional parameters each referencing an * HttpRequest object. * - * Throws HttpRequestException, HttpRequestPoolException, HttpInvalidParamException. + * Throws HttpRequestPoolException (HttpRequestException, HttpInvalidParamException). * * Example: *
@@ -205,16 +205,21 @@ PHP_METHOD(HttpRequestPool, __construct) zval ***argv = safe_emalloc(argc, sizeof(zval *), 0); getObject(http_requestpool_object, obj); + SET_EH_THROW_HTTP(); if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) { int i; 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_attach(&obj->pool, *(argv[i])); + http_request_pool_try { + http_request_pool_attach(&obj->pool, *(argv[i])); + } http_request_pool_catch(); } } + http_request_pool_final(); } efree(argv); + SET_EH_NORMAL(); } /* }}} */ @@ -311,8 +316,7 @@ PHP_METHOD(HttpRequestPool, detach) * * Returns TRUE on success, or FALSE on failure. * - * Throws HttpSocketException, HttpRequestException, - * HttpRequestPoolException, HttpMalformedHeaderException. + * Throws HttpRequestPoolException (HttpSocketException, HttpRequestException, HttpMalformedHeaderException). */ PHP_METHOD(HttpRequestPool, send) {