From 9206e8a7381d62a5f8362f541ab9c052f06a9d50 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 21 Sep 2022 12:59:40 -0600 Subject: Tweak some comments --- modules/caddyhttp/responsewriter.go | 3 ++- modules/caddyhttp/server.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/caddyhttp') diff --git a/modules/caddyhttp/responsewriter.go b/modules/caddyhttp/responsewriter.go index d29f6a7..0631229 100644 --- a/modules/caddyhttp/responsewriter.go +++ b/modules/caddyhttp/responsewriter.go @@ -170,9 +170,10 @@ func (rr *responseRecorder) WriteHeader(statusCode int) { return } - // save statusCode in case http middleware upgrading websocket + // save statusCode always, in case HTTP middleware upgrades websocket // connections by manually setting headers and writing status 101 rr.statusCode = statusCode + // 1xx responses aren't final; just informational if statusCode < 100 || statusCode > 199 { rr.wroteHeader = true diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go index d9fe077..5daa5b2 100644 --- a/modules/caddyhttp/server.go +++ b/modules/caddyhttp/server.go @@ -239,7 +239,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } - repl.Set("http.response.status", wrec.Status()) + repl.Set("http.response.status", wrec.Status()) // will be 0 if no response is written by us (Go will write 200 to client) repl.Set("http.response.size", wrec.Size()) repl.Set("http.response.duration", duration) repl.Set("http.response.duration_ms", duration.Seconds()*1e3) // multiply seconds to preserve decimal (see #4666) -- cgit v1.2.3