X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_curl.c;h=91b476c3b5076e15997b5889879441519ef1d335;hb=59ffe749e2571c7e4bf0cce12997f95f350bd58c;hp=71365dc04ea89d99c56cba0e5d75d793fb64fb6d;hpb=7dc5de0b79846bfe33ca36a9eeb894ef2ecfdee1;p=m6w6%2Fext-http diff --git a/php_http_curl.c b/php_http_curl.c index 71365dc..91b476c 100644 --- a/php_http_curl.c +++ b/php_http_curl.c @@ -1,19 +1,26 @@ - -#include "php_http.h" -#include "php_http_request.h" -#include "php_http_request_pool.h" +/* + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2011, Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#include "php_http_api.h" + +#if PHP_HTTP_HAVE_CURL #include #define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z))) -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT # include #endif -#include -#include - - typedef struct php_http_curl_request { CURL *handle; @@ -47,7 +54,7 @@ typedef struct php_http_curl_request_pool { int unfinished; /* int because of curl_multi_perform() */ -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT struct event *timeout; unsigned useevents:1; unsigned runsocket:1; @@ -227,6 +234,7 @@ static int php_http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, php_http_request_t *h = ctx; php_http_curl_request_t *curl = h->ctx; unsigned flags = 0; + TSRMLS_FETCH_FROM_CTX(h->ts); /* catch progress */ switch (type) { @@ -322,7 +330,7 @@ static STATUS php_http_curl_request_prepare(php_http_request_t *h, php_http_requ break; default: { - const char *name = php_http_request_method_name(meth); + const char *name = php_http_request_method_name(meth TSRMLS_CC); if (name) { curl_easy_setopt(curl->handle, CURLOPT_CUSTOMREQUEST, name); @@ -394,7 +402,7 @@ static void php_http_curl_request_pool_responsehandler(php_http_request_pool_t * } -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT typedef struct php_http_request_pool_event { struct event evnt; @@ -483,7 +491,7 @@ static int php_http_curl_request_pool_socket_callback(CURL *easy, curl_socket_t ev = ecalloc(1, sizeof(php_http_request_pool_event_t)); ev->pool = pool; curl_multi_assign(curl->handle, sock, ev); - event_base_set(PHP_HTTP_G->request_pool.event_base, &ev->evnt); + event_base_set(PHP_HTTP_G->curl.event_base, &ev->evnt); } else { event_del(&ev->evnt); } @@ -501,6 +509,7 @@ static int php_http_curl_request_pool_socket_callback(CURL *easy, curl_socket_t case CURL_POLL_REMOVE: efree(ev); + /* no break */ case CURL_POLL_NONE: return 0; @@ -534,7 +543,7 @@ static void php_http_curl_request_pool_timer_callback(CURLM *multi, long timeout if (!event_initialized(curl->timeout)) { event_set(curl->timeout, -1, 0, php_http_curl_request_pool_timeout_callback, pool); - event_base_set(PHP_HTTP_G->request_pool.event_base, curl->timeout); + event_base_set(PHP_HTTP_G->curl.event_base, curl->timeout); } else if (event_pending(curl->timeout, EV_TIMEOUT, NULL)) { event_del(curl->timeout); } @@ -591,6 +600,7 @@ static STATUS set_options(php_http_request_t *h, HashTable *options) int range_req = 0; php_http_curl_request_t *curl = h->ctx; CURL *ch = curl->handle; + TSRMLS_FETCH_FROM_CTX(h->ts); /* proxy */ if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("proxyhost"), IS_STRING))) { @@ -861,7 +871,7 @@ static STATUS set_options(php_http_request_t *h, HashTable *options) zval *urlenc_cookies = NULL; /* check whether cookies should not be urlencoded; default is to urlencode them */ if ((!(urlenc_cookies = get_option(&curl->options.cache, options, ZEND_STRS("encodecookies"), IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) { - if (SUCCESS == php_http_url_encode_hash_recursive(HASH_OF(zoption), &curl->options.cookies, "; ", lenof("; "), NULL, 0 TSRMLS_CC)) { + if (SUCCESS == php_http_url_encode_hash_ex(HASH_OF(zoption), &curl->options.cookies, ZEND_STRS(";"), ZEND_STRS("="), NULL, 0 TSRMLS_CC)) { php_http_buffer_fix(&curl->options.cookies); curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data); } @@ -1187,9 +1197,10 @@ static void php_http_curl_request_datashare_unlock_func(CURL *handle, curl_lock_ /* request datashare handler ops */ -static php_http_request_datashare_t *php_http_curl_request_datashare_init(php_http_request_datashare_t *h, void *handle TSRMLS_DC) +static php_http_request_datashare_t *php_http_curl_request_datashare_init(php_http_request_datashare_t *h, void *handle) { php_http_curl_request_datashare_t *curl; + TSRMLS_FETCH_FROM_CTX(h->ts); if (!handle && !(handle = php_http_resource_factory_handle_ctor(h->rf TSRMLS_CC))) { php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_DATASHARE, "could not initialize curl share handle"); @@ -1200,11 +1211,11 @@ static php_http_request_datashare_t *php_http_curl_request_datashare_init(php_ht curl->handle = handle; #ifdef ZTS if (h->persistent) { - curl->locks = php_http_request_datashare_locks_init(); + curl->locks = php_http_curl_request_datashare_locks_init(); if (curl->locks) { - curl_share_setopt(share->ch, CURLSHOPT_LOCKFUNC, php_http_curl_request_datashare_lock_func); - curl_share_setopt(share->ch, CURLSHOPT_UNLOCKFUNC, php_http_curl_request_datashare_unlock_func); - curl_share_setopt(share->ch, CURLSHOPT_USERDATA, curl->locks); + curl_share_setopt(curl->handle, CURLSHOPT_LOCKFUNC, php_http_curl_request_datashare_lock_func); + curl_share_setopt(curl->handle, CURLSHOPT_UNLOCKFUNC, php_http_curl_request_datashare_unlock_func); + curl_share_setopt(curl->handle, CURLSHOPT_USERDATA, curl->locks); } } #endif @@ -1222,7 +1233,7 @@ static void php_http_curl_request_datashare_dtor(php_http_request_datashare_t *h #ifdef ZTS if (h->persistent) { - http_request_datashare_locks_dtor(curl->locks); + php_http_curl_request_datashare_locks_dtor(curl->locks); } #endif @@ -1314,9 +1325,10 @@ PHP_HTTP_API php_http_request_datashare_ops_t *php_http_curl_get_request_datasha /* request pool handler ops */ -static php_http_request_pool_t *php_http_curl_request_pool_init(php_http_request_pool_t *h, void *handle TSRMLS_DC) +static php_http_request_pool_t *php_http_curl_request_pool_init(php_http_request_pool_t *h, void *handle) { php_http_curl_request_pool_t *curl; + TSRMLS_FETCH_FROM_CTX(h->ts); if (!handle && !(handle = php_http_resource_factory_handle_ctor(h->rf TSRMLS_CC))) { php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_POOL, "could not initialize curl pool handle"); @@ -1336,7 +1348,7 @@ static void php_http_curl_request_pool_dtor(php_http_request_pool_t *h) php_http_curl_request_pool_t *curl = h->ctx; TSRMLS_FETCH_FROM_CTX(h->ts); -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT if (curl->timeout) { efree(curl->timeout); curl->timeout = NULL; @@ -1345,7 +1357,7 @@ static void php_http_curl_request_pool_dtor(php_http_request_pool_t *h) curl->unfinished = 0; php_http_request_pool_reset(h); - php_http_resource_factory_handle_dtor(h->rf, curl->handle); + php_http_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC); efree(curl); h->ctx = NULL; @@ -1356,6 +1368,7 @@ static STATUS php_http_curl_request_pool_attach(php_http_request_pool_t *h, php_ php_http_curl_request_pool_t *curl = h->ctx; php_http_curl_request_t *recurl = r->ctx; CURLMcode rs; + TSRMLS_FETCH_FROM_CTX(h->ts); if (SUCCESS != php_http_curl_request_prepare(r, m, url, body)) { return FAILURE; @@ -1375,6 +1388,7 @@ static STATUS php_http_curl_request_pool_detach(php_http_request_pool_t *h, php_ php_http_curl_request_pool_t *curl = h->ctx; php_http_curl_request_t *recurl = r->ctx; CURLMcode rs = curl_multi_remove_handle(curl->handle, recurl->handle); + TSRMLS_FETCH_FROM_CTX(h->ts); if (CURLM_OK == rs) { return SUCCESS; @@ -1397,9 +1411,9 @@ static STATUS php_http_curl_request_pool_wait(php_http_request_pool_t *h, struct struct timeval timeout; php_http_curl_request_pool_t *curl = h->ctx; -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT if (curl->useevents) { - TSRMLS_FETCH_FROM_CTX(pool->ts); + TSRMLS_FETCH_FROM_CTX(h->ts); php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "not implemented"); return FAILURE; @@ -1438,10 +1452,10 @@ static STATUS php_http_curl_request_pool_wait(php_http_request_pool_t *h, struct static int php_http_curl_request_pool_once(php_http_request_pool_t *h) { php_http_curl_request_pool_t *curl = h->ctx; - TSRMLS_FETCH_FROM_CTX(h->ts); -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT if (curl->useevents) { + TSRMLS_FETCH_FROM_CTX(h->ts); php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "not implemented"); return FAILURE; } @@ -1454,14 +1468,16 @@ static int php_http_curl_request_pool_once(php_http_request_pool_t *h) return curl->unfinished; } -#ifdef PHP_HTTP_HAVE_EVENT +#if PHP_HTTP_HAVE_EVENT static void dolog(int i, const char *m) { fprintf(stderr, "%d: %s\n", i, m); } #endif static STATUS php_http_curl_request_pool_exec(php_http_request_pool_t *h) { -#ifdef PHP_HTTP_HAVE_EVENT + TSRMLS_FETCH_FROM_CTX(h->ts); + +#if PHP_HTTP_HAVE_EVENT php_http_curl_request_pool_t *curl = h->ctx; if (curl->useevents) { @@ -1470,7 +1486,7 @@ static STATUS php_http_curl_request_pool_exec(php_http_request_pool_t *h) #if DBG_EVENTS fprintf(stderr, "X"); #endif - event_base_dispatch(PHP_HTTP_G->request_pool.event_base); + event_base_dispatch(PHP_HTTP_G->curl.event_base); } while (curl->unfinished); } else #endif @@ -1589,7 +1605,7 @@ static php_http_request_t *php_http_curl_request_init(php_http_request_t *h, voi curl_easy_setopt(handle, CURLOPT_DEBUGDATA, h); curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, h); - php_http_curl_request_reset(h TSRMLS_CC); + php_http_curl_request_reset(h); return h; } @@ -1614,6 +1630,7 @@ static php_http_request_t *php_http_curl_request_copy(php_http_request_t *from, static void php_http_curl_request_dtor(php_http_request_t *h) { php_http_curl_request_t *ctx = h->ctx; + TSRMLS_FETCH_FROM_CTX(h->ts); curl_easy_setopt(ctx->handle, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(ctx->handle, CURLOPT_PROGRESSFUNCTION, NULL); @@ -1629,7 +1646,7 @@ static void php_http_curl_request_dtor(php_http_request_t *h) curl_slist_free_all(ctx->options.headers); ctx->options.headers = NULL; } - php_http_request_progress_dtor(&ctx->progress); + php_http_request_progress_dtor(&ctx->progress TSRMLS_CC); efree(ctx); h->ctx = NULL; @@ -1814,6 +1831,7 @@ retry: static STATUS php_http_curl_request_setopt(php_http_request_t *h, php_http_request_setopt_opt_t opt, void *arg) { php_http_curl_request_t *curl = h->ctx; + TSRMLS_FETCH_FROM_CTX(h->ts); switch (opt) { case PHP_HTTP_REQUEST_OPT_SETTINGS: @@ -2130,11 +2148,23 @@ PHP_MSHUTDOWN_FUNCTION(http_curl) PHP_RINIT_FUNCTION(http_curl) { -#ifdef PHP_HTTP_HAVE_EVENT - if (!PHP_HTTP_G->request_pool.event_base && !(PHP_HTTP_G->request_pool.event_base = event_init())) { +#if PHP_HTTP_HAVE_EVENT + if (!PHP_HTTP_G->curl.event_base && !(PHP_HTTP_G->curl.event_base = event_init())) { return FAILURE; } #endif return SUCCESS; } + +#endif /* PHP_HTTP_HAVE_CURL */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ +