diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2021-04-17 00:34:48 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-04-17 11:03:30 +0200 |
| commit | 2f78be51ebe8578bce5469924cedf7ac8bc06a85 (patch) | |
| tree | f05d6c07cdd1c9e0191a172c2fbd724526e04f7d | |
| parent | 2cd26861296c701d6380bc770ea3e09f72187aad (diff) | |
| download | curl-2f78be51ebe8578bce5469924cedf7ac8bc06a85.tar.gz | |
tool_writeout: fix the HTTP_CODE json output
Update test 970 accordingly.
Reported-by: Michal Rus
Fixes #6905
Closes #6906
| -rw-r--r-- | src/tool_writeout.c | 13 | ||||
| -rw-r--r-- | tests/data/test970 | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/tool_writeout.c b/src/tool_writeout.c index 529677818..ed7a3418e 100644 --- a/src/tool_writeout.c +++ b/src/tool_writeout.c @@ -259,12 +259,13 @@ static int writeLong(FILE *stream, const struct writeoutvar *wovar, if(valid) { if(use_json) - fprintf(stream, "\"%s\":", wovar->name); - - if(wovar->id == VAR_HTTP_CODE || wovar->id == VAR_HTTP_CODE_PROXY) - fprintf(stream, "%03ld", longinfo); - else - fprintf(stream, "%ld", longinfo); + fprintf(stream, "\"%s\":%ld", wovar->name, longinfo); + else { + if(wovar->id == VAR_HTTP_CODE || wovar->id == VAR_HTTP_CODE_PROXY) + fprintf(stream, "%03ld", longinfo); + else + fprintf(stream, "%ld", longinfo); + } } else { if(use_json) diff --git a/tests/data/test970 b/tests/data/test970 index d052e809d..ee0a3e9ae 100644 --- a/tests/data/test970 +++ b/tests/data/test970 @@ -59,7 +59,7 @@ Accept: */* </protocol> <stdout nonewline="yes"> -{"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":000,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"} +{"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":0,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"} </stdout> </verify> </testcase> |