X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=49b699b04dba59a7fea3b83827273d72f5b2a2a7;hp=b41e020b418f8e1d598140d9707c39029c27a358;hb=13941ce7e1264e891630fc7f909bbd11a1282721;hpb=2269e8e11a6837fc165ae85406ea6db84c1995cc diff --git a/http_request_api.c b/http_request_api.c index b41e020..49b699b 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -47,7 +47,7 @@ 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) @@ -129,9 +129,6 @@ 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); -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); #if HTTP_CURL_USE_ZEND_MM static void http_curl_free(void *p) { efree(p); } @@ -352,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 */ @@ -605,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; @@ -614,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; @@ -706,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; } /* }}} */ @@ -850,7 +859,6 @@ 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)); @@ -861,6 +869,7 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req zend_llist_add_element(&pool->bodies, &body); return SUCCESS; } + efree(body); } return FAILURE; } @@ -874,7 +883,7 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req fprintf(stderr, "Detaching request %p (pool: %p) from pool %p\n", req, req->pool, pool); #endif if (req->pool != pool) { - http_error_ex(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool (%p != %p)", req->pool, pool); + http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool"); } else { CURLMcode code; @@ -906,8 +915,7 @@ 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 - http_request_pool_perform(pool); - while (pool->unfinished) { + while (http_request_pool_perform(pool)) { #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "%d unfinished requests of pool %p remaining\n", pool->unfinished, pool); #endif @@ -915,7 +923,6 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) 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; @@ -935,31 +942,32 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) } /* }}} */ -/*#*/ - -/* {{{ static void http_request_pool_freebody(http_request_body **) */ -static void http_request_pool_freebody(http_request_body **body) +/* {{{ STATUS http_request_pool_select(http_request_pool *) */ +PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) { - TSRMLS_FETCH(); - http_request_body_free(*body); + 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; } /* }}} */ -/* {{{ static void http_request_pool_freehandle(zval **, http_request_pool *) */ -static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC) +/* {{{ int http_request_pool_perform(http_request_pool *) */ +PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool) { - 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 + while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); + return pool->unfinished; } /* }}} */ -/* {{{ static void http_request_pool_responsehandler(zval **) */ -static void http_request_pool_responsehandler(zval **req TSRMLS_DC) +/* {{{ 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 @@ -969,26 +977,26 @@ static void http_request_pool_responsehandler(zval **req TSRMLS_DC) } /* }}} */ -/* {{{ static inline STATUS http_request_pool_select(http_request_pool *) */ -static inline 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; +/* {{{ 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 inline void http_request_pool_perform(http_request_pool *) */ -static inline void http_request_pool_perform(http_request_pool *pool) +/* {{{ static void http_request_pool_freehandle(zval **, http_request_pool *) */ +static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC) { - while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); + 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 } /* }}} */ @@ -1044,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); } /* }}} */