From 884de1a763af186984cbcbe7b35b551c06025284 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 26 Mar 2020 23:15:37 +0100 Subject: writeout_json: Fix data type issues Load long values correctly (e.g. for http_code). Use curl_off_t (not long) for: - size_download (CURLINFO_SIZE_DOWNLOAD_T) - size_upload (CURLINFO_SIZE_UPLOAD_T) The unit for these values is bytes/second, not microseconds: - speed_download (CURLINFO_SPEED_DOWNLOAD_T) - speed_upload (CURLINFO_SPEED_UPLOAD_T) Fixes #5131 Closes #5152 --- src/tool_writeout.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tool_writeout.c') diff --git a/src/tool_writeout.c b/src/tool_writeout.c index 9fbc8665d..32c95b45f 100644 --- a/src/tool_writeout.c +++ b/src/tool_writeout.c @@ -55,13 +55,13 @@ static const struct writeoutvar variables[] = { {"size_request", VAR_REQUEST_SIZE, 0, CURLINFO_REQUEST_SIZE, JSON_LONG}, {"size_download", VAR_SIZE_DOWNLOAD, 0, - CURLINFO_SIZE_DOWNLOAD_T, JSON_LONG}, + CURLINFO_SIZE_DOWNLOAD_T, JSON_OFFSET}, {"size_upload", VAR_SIZE_UPLOAD, 0, - CURLINFO_SIZE_UPLOAD_T, JSON_LONG}, + CURLINFO_SIZE_UPLOAD_T, JSON_OFFSET}, {"speed_download", VAR_SPEED_DOWNLOAD, 0, - CURLINFO_SPEED_DOWNLOAD_T, JSON_TIME}, + CURLINFO_SPEED_DOWNLOAD_T, JSON_OFFSET}, {"speed_upload", VAR_SPEED_UPLOAD, 0, - CURLINFO_SPEED_UPLOAD_T, JSON_TIME}, + CURLINFO_SPEED_UPLOAD_T, JSON_OFFSET}, {"content_type", VAR_CONTENT_TYPE, 0, CURLINFO_CONTENT_TYPE, JSON_STRING}, {"num_connects", VAR_NUM_CONNECTS, 0, -- cgit v1.2.3