X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=3dabcd759d5302d2094f534ebec04ef39836268c;hb=0504cc33523ceb65995199ddd319771a94d5e1c3;hp=87d40a01e49e1d47f8c6c335c66a7c25af204c39;hpb=96f5c917e43d94f2d5d7f092a09422db6b13f307;p=m6w6%2Fext-http diff --git a/http_request_api.c b/http_request_api.c index 87d40a0..3dabcd7 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -32,18 +32,12 @@ #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_request_api.h" -#include "php_http_request_object.h" -#include "php_http_requestpool_object.h" #include "php_http_url_api.h" #ifndef HTTP_CURL_USE_ZEND_MM # 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 @@ -122,8 +116,6 @@ static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void #define http_curl_callback_data(data) _http_curl_callback_data((data) TSRMLS_CC) 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_freehandle(zval **request, http_request_pool *pool TSRMLS_DC); #if HTTP_CURL_USE_ZEND_MM static void http_curl_free(void *p) { efree(p); } @@ -161,7 +153,7 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC) { case COPY_STRING: { - char *new_str = estrdup((const char*) data); + char *new_str = estrdup(data); zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str); return new_str; } @@ -177,7 +169,7 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC) zend_llist_add_element(&HTTP_G(request).copies.contexts, &data); return data; } - + default: { return data; @@ -189,6 +181,7 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC) /* {{{ void http_request_data_free_string(char **) */ void _http_request_data_free_string(void *string) { + //fprintf(stderr, "FREE STRING %p (%s)\n", *((char **)string), *((char **)string)); efree(*((char **)string)); } /* }}} */ @@ -326,7 +319,7 @@ PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC) /* }}} */ /* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *, phpstr *) */ -PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC) +PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC) { zval *zoption; zend_bool range_req = 0; @@ -338,12 +331,13 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const /* set options */ if (url) { - HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, (void *) url)); + HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, url)); } if (response) { - HTTP_CURL_OPT(WRITEDATA, http_curl_callback_data(response)); - HTTP_CURL_OPT(WRITEHEADER, http_curl_callback_data(response)); + http_curl_callback_ctx *response_ctx = http_curl_callback_data(response); + HTTP_CURL_OPT(WRITEDATA, response_ctx); + HTTP_CURL_OPT(WRITEHEADER, response_ctx); } HTTP_CURL_OPT(HEADER, 0); @@ -419,7 +413,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const /* compress, empty string enables deflate and gzip */ if (zoption = http_curl_getopt(options, "compress", IS_BOOL)) { if (Z_LVAL_P(zoption)) { - HTTP_CURL_OPT(ENCODING, http_request_data_copy(COPY_STRING, "")); + HTTP_CURL_OPT(ENCODING, ""); } } @@ -443,7 +437,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) { HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } else { - HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")")); + HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"); } /* additional headers, array('name' => 'value') */ @@ -708,7 +702,7 @@ 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) +PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) { STATUS status; zend_bool clean_curl; @@ -820,194 +814,6 @@ PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_ /* }}} */ -/* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */ -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; - } - - if (!pool->ch) { - if (!(pool->ch = curl_multi_init())) { - http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl"); - if (free_pool) { - efree(pool); - } - return NULL; - } - } - - 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; -} -/* }}} */ - -/* {{{ STATUS http_request_pool_attach(http_request_pool *, zval *) */ -PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC) -{ - getObjectEx(http_request_object, req, request); -#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; - http_request_body *body = http_request_body_new(); - zval *info = GET_PROP_EX(req, request, responseInfo); - - if (SUCCESS != http_request_object_requesthandler(req, request, 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->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; -} -/* }}} */ - -/* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */ -PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC) -{ - getObjectEx(http_request_object, req, request); -#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->pool = NULL; - zval_ptr_dtor(&request); - return SUCCESS; - } - } - return FAILURE; -} -/* }}} */ - -/* {{{ 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) -{ -#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; - } - } - zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC); - return SUCCESS; -} -/* }}} */ - -/* {{{ void http_request_pool_dtor(http_request_pool *) */ -PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) -{ -#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); -} -/* }}} */ - -/* {{{ 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; - struct timeval timeout = {1, 0}; - - FD_ZERO(&R); - FD_ZERO(&W); - FD_ZERO(&E); - - curl_multi_fdset(pool->ch, &R, &W, &E, &MAX); - return (-1 != select(MAX + 1, &R, &W, &E, &timeout)) ? SUCCESS : FAILURE; -} -/* }}} */ - -/* {{{ 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); -} -/* }}} */ - -/*#*/ - -/* {{{ 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 -} -/* }}} */ - /* {{{ char *http_request_methods[] */ static const char *const http_request_methods[] = { "UNKOWN",