X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fhttp.c;h=7a61b132b92bd72b94ebdc9915e311235b53fc56;hb=fd70e3619c00bc9f7b2f80cadf3fdb348cbacf51;hp=93fcd0d8e44a5528a4e36879bbd75af9afe9904e;hpb=bd915a6b96d5dab1a30a83a4ddfcf15a0f74c92e;p=fio.git diff --git a/engines/http.c b/engines/http.c index 93fcd0d8..7a61b132 100644 --- a/engines/http.c +++ b/engines/http.c @@ -273,6 +273,8 @@ static void _hmac(unsigned char *md, void *key, int key_len, char *data) { ctx = HMAC_CTX_new(); #else ctx = &_ctx; + /* work-around crash in certain versions of libssl */ + HMAC_CTX_init(ctx); #endif HMAC_Init_ex(ctx, key, key_len, EVP_sha256(), NULL); HMAC_Update(ctx, (unsigned char*)data, strlen(data)); @@ -294,9 +296,11 @@ static int _curl_trace(CURL *handle, curl_infotype type, switch (type) { case CURLINFO_TEXT: - fprintf(stderr, "== Info: %s", data); + fprintf(stderr, "== Info: %s", data); + /* fall through */ default: case CURLINFO_SSL_DATA_OUT: + /* fall through */ case CURLINFO_SSL_DATA_IN: return 0; @@ -635,10 +639,10 @@ static int fio_http_invalidate(struct thread_data *td, struct fio_file *f) return 0; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name = "http", .version = FIO_IOOPS_VERSION, - .flags = FIO_DISKLESSIO, + .flags = FIO_DISKLESSIO | FIO_SYNCIO, .setup = fio_http_setup, .queue = fio_http_queue, .getevents = fio_http_getevents,