From: Jay Satiro Date: Sun, 11 Jan 2026 19:56:24 +0000 (-0500) Subject: tool_cb_hdr: suppress header output when --out-null X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3652127e81f0527f604338f4b950bf7a8bd4fe73;p=thirdparty%2Fcurl.git tool_cb_hdr: suppress header output when --out-null This change brings --out-null more in line with the documentation which says --out-null is expected to behave like a portable -o /dev/null. Prior to this change curl did not suppress the header output from --head when --out-null was used to suppress output. Assisted-by: Daniel Stenberg Reported-by: Andrew Kvalheim Ref: https://curl.se/docs/manpage.html#--out-null Fixes https://github.com/curl/curl/discussions/20235 Closes https://github.com/curl/curl/pull/20256 --- diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c index 573a1b7e2d..3b84f65d1f 100644 --- a/src/tool_cb_hdr.c +++ b/src/tool_cb_hdr.c @@ -275,9 +275,9 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata) else if(ptr[0] == '\r' || ptr[0] == '\n') per->was_last_header_empty = TRUE; } - if(hdrcbdata->config->show_headers && - (scheme == proto_http || scheme == proto_https || - scheme == proto_rtsp || scheme == proto_file)) { + if(hdrcbdata->config->show_headers && !outs->out_null && + (scheme == proto_http || scheme == proto_https || + scheme == proto_rtsp || scheme == proto_file)) { /* bold headers only for selected protocols */ char *value = NULL; diff --git a/tests/data/test756 b/tests/data/test756 index 4b09c750dc..013273dd78 100644 --- a/tests/data/test756 +++ b/tests/data/test756 @@ -61,13 +61,6 @@ Accept: */* -HTTP/1.1 200 OK -Date: Thu, 09 Nov 2010 14:49:00 GMT -Server: test-server/fake -Response: 1 -Content-Type: text/html -Content-Length: 8 - HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake