Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-06 22:40:31 -05:00
Code Issues Activity

caddyhttp: Return error if error handling error

Browse source 
Before, if there was an error in the error handler, we would not write a
status code, which resulted in Go writing a 200 for us by default, which
does not make sense when there's an error. Now we write the second
error's status if available, otherwise 500.
This commit is contained in:
Matthew Holt 2020-11-18 16:14:50 -07:00
parent 1438e4dbc8
commit 349457cc1b
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/caddyhttp/server.go
View file

@ -247,6 +247,11 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
zap.String("msg", errMsg), zap.String("msg", errMsg),
}, errFields...) }, errFields...)
logger.Error("error handling handler error", errFields...) logger.Error("error handling handler error", errFields...)
if handlerErr, ok := err.(HandlerError); ok {
w.WriteHeader(handlerErr.StatusCode)
} else {
w.WriteHeader(http.StatusInternalServerError)
}
} }
} else { } else {
if errStatus >= 500 { if errStatus >= 500 {