X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=49b699b04dba59a7fea3b83827273d72f5b2a2a7;hp=934bc87f5e58737523c8f4a9d25d4c59a1785c22;hb=13941ce7e1264e891630fc7f909bbd11a1282721;hpb=b30c267318b2b1add1a01e783f9dbe561a649a7b diff --git a/http_request_api.c b/http_request_api.c index 934bc87..49b699b 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -40,10 +40,14 @@ # define HTTP_CURL_USE_ZEND_MM 0 #endif +#ifndef HTTP_DEBUG_REQPOOLS +# define HTTP_DEBUG_REQPOOLS 0 +#endif + ZEND_EXTERN_MODULE_GLOBALS(http) #if LIBCURL_VERSION_NUM < 0x070c00 -# define curl_easy_strerror(code) HTTP_G(request).curl.error +# define curl_easy_strerror(code) HTTP_G(request).error #endif #define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I) @@ -124,9 +128,7 @@ typedef struct { static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC); static void http_request_pool_freebody(http_request_body **body); -static void http_request_pool_responsehandler(zval **req TSRMLS_DC); -static inline STATUS http_request_pool_select(http_request_pool *pool); -static inline void http_request_pool_perform(http_request_pool *pool); +static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC); #if HTTP_CURL_USE_ZEND_MM static void http_curl_free(void *p) { efree(p); } @@ -168,13 +170,13 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC) zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str); return new_str; } - + case COPY_SLIST: { zend_llist_add_element(&HTTP_G(request).copies.slists, &data); return data; } - + default: { return data; @@ -347,7 +349,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const HTTP_CURL_OPT(NOSIGNAL, 1); #endif #if LIBCURL_VERSION_NUM < 0x070c00 - HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).curl.error); + HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error); #endif /* progress callback */ @@ -600,7 +602,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const switch (body->type) { case HTTP_REQUEST_BODY_CSTRING: - curl_easy_setopt(ch, CURLOPT_POSTFIELDS, (char *) body->data); + curl_easy_setopt(ch, CURLOPT_POSTFIELDS, body->data); curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, body->size); break; @@ -609,8 +611,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const break; case HTTP_REQUEST_BODY_UPLOADFILE: - case HTTP_REQUEST_BODY_UPLOADDATA: - curl_easy_setopt(ch, CURLOPT_READDATA, body); + curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body)); curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size); break; @@ -701,10 +702,23 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC) /* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) { - if (SUCCESS != http_request_init(ch, meth, url, body, options, response)) { - return FAILURE; + STATUS status; + zend_bool clean_curl; + + if ((clean_curl = (!ch))) { + if (!(ch = curl_easy_init())) { + http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl."); + return FAILURE; + } + } + + status = ((SUCCESS == http_request_init(ch, meth, url, body, options, response)) && + (SUCCESS == http_request_exec(ch, info))) ? SUCCESS : FAILURE; + + if (clean_curl) { + curl_easy_cleanup(ch); } - return http_request_exec(ch, info); + return status; } /* }}} */ @@ -802,7 +816,9 @@ PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC) { zend_bool free_pool; - +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Initializing request pool\n"); +#endif if ((free_pool = (!pool))) { pool = emalloc(sizeof(http_request_pool)); pool->ch = NULL; @@ -821,7 +837,9 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool pool->unfinished = 0; zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); zend_llist_init(&pool->bodies, sizeof(http_request_body *), (llist_dtor_func_t) http_request_pool_freebody, 0); - +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Initialized request pool %p\n", pool); +#endif return pool; } /* }}} */ @@ -830,8 +848,10 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC) { getObjectEx(http_request_object, req, request); - - if (req->attached) { +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Attaching request %p to pool %p\n", req, pool); +#endif + if (req->pool) { http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is already member of an HttpRequestPool"); } else { CURLMcode code; @@ -839,17 +859,17 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req zval *info = GET_PROP_EX(req, request, responseInfo); if (SUCCESS != http_request_object_requesthandler(req, request, body)) { - efree(body); http_error_ex(E_WARNING, HTTP_E_CURL, "Could not initialize HttpRequest object for attaching to the HttpRequestPool"); } else if (CURLM_OK != (code = curl_multi_add_handle(pool->ch, req->ch))) { http_error_ex(E_WARNING, HTTP_E_CURL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code)); } else { - req->attached = 1; + req->pool = pool; zval_add_ref(&request); zend_llist_add_element(&pool->handles, &request); zend_llist_add_element(&pool->bodies, &body); return SUCCESS; } + efree(body); } return FAILURE; } @@ -859,16 +879,18 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC) { getObjectEx(http_request_object, req, request); - - if (!req->attached) { - http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to an HttpRequestPool"); +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Detaching request %p (pool: %p) from pool %p\n", req, req->pool, pool); +#endif + if (req->pool != pool) { + http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool"); } else { CURLMcode code; if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) { http_error_ex(E_WARNING, HTTP_E_CURL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code)); } else { - req->attached = 0; + req->pool = NULL; zval_ptr_dtor(&request); return SUCCESS; } @@ -877,42 +899,51 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req } /* }}} */ +/* {{{ void http_request_pool_detach_all(http_request_pool *) */ +PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC) +{ +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Detaching all requests from pool %p\n", pool); +#endif + zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_freehandle, pool TSRMLS_CC); +} + + /* {{{ STATUS http_request_pool_send(http_request_pool *) */ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) { - http_request_pool_perform(pool); - while (pool->unfinished) { +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Attempt to send requests of pool %p\n", pool); +#endif + while (http_request_pool_perform(pool)) { +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "%d unfinished requests of pool %p remaining\n", pool->unfinished, pool); +#endif if (SUCCESS != http_request_pool_select(pool)) { http_error(E_WARNING, HTTP_E_CURL, "Socket error"); return FAILURE; } - http_request_pool_perform(pool); } zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC); return SUCCESS; } /* }}} */ -/*#*/ - -/* {{{ static void http_request_pool_free_body(http_request_body *) */ -static void http_request_pool_freebody(http_request_body **body) +/* {{{ void http_request_pool_dtor(http_request_pool *) */ +PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) { - TSRMLS_FETCH(); - http_request_body_free(*body); -} -/* }}} */ - -/* {{{ static void http_request_pool_responsehandler(zval **) */ -static void http_request_pool_responsehandler(zval **req TSRMLS_DC) -{ - getObjectEx(http_request_object, obj, *req); - http_request_object_responsehandler(obj, *req, NULL); +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Destructing request pool %p\n", pool); +#endif + pool->unfinished = 0; + zend_llist_clean(&pool->handles); + zend_llist_clean(&pool->bodies); + curl_multi_cleanup(pool->ch); } /* }}} */ -/* {{{ static inline STATUS http_request_pool_select(http_request_pool *) */ -static inline STATUS http_request_pool_select(http_request_pool *pool) +/* {{{ STATUS http_request_pool_select(http_request_pool *) */ +PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) { int MAX; fd_set R, W, E; @@ -927,10 +958,45 @@ static inline STATUS http_request_pool_select(http_request_pool *pool) } /* }}} */ -/* {{{ static inline void http_request_pool_perform(http_request_pool *) */ -static inline void http_request_pool_perform(http_request_pool *pool) +/* {{{ int http_request_pool_perform(http_request_pool *) */ +PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool) { while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); + return pool->unfinished; +} +/* }}} */ + +/* {{{ void http_request_pool_responsehandler(zval **) */ +void _http_request_pool_responsehandler(zval **req TSRMLS_DC) +{ + getObjectEx(http_request_object, obj, *req); +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Fetching data from request %p of pool %p\n", obj, obj->pool); +#endif + http_request_object_responsehandler(obj, *req, NULL); +} +/* }}} */ + +/*#*/ + +/* {{{ static void http_request_pool_freebody(http_request_body **) */ +static void http_request_pool_freebody(http_request_body **body) +{ + TSRMLS_FETCH(); + http_request_body_free(*body); +} +/* }}} */ + +/* {{{ static void http_request_pool_freehandle(zval **, http_request_pool *) */ +static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC) +{ + getObjectEx(http_request_object, req, *request); + if (req->pool) { + http_request_pool_detach(pool, *request); + } +#if HTTP_DEBUG_REQPOOLS + else fprintf(stderr, "Request %p (pool: %p) is not (anymore) attached to pool %p\n", req, req->pool, pool); +#endif } /* }}} */ @@ -986,40 +1052,10 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s) static char *offset = NULL, *original = NULL; HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body); - switch (body->type) - { - case HTTP_REQUEST_BODY_UPLOADFILE: - { - TSRMLS_FETCH(); - return php_stream_read((php_stream *) body->data, data, len * n); - } - break; - - case HTTP_REQUEST_BODY_UPLOADDATA: - { - size_t avail; - if (original != s) { - original = offset = s; - } - if ((avail = body->size - (offset - original)) < 1) { - return 0; - } - if (avail < (len * n)) { - memcpy(data, offset, avail); - offset += avail; - return avail; - } else { - memcpy(data, offset, len * n); - offset += len * n; - return len * n; - } - } - break; - - default: - return 0; - break; + if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) { + return 0; } + return php_stream_read((php_stream *) body->data, data, len * n); } /* }}} */