caddyhttp: Default to error status if found in context

This is just a convenience if using a static_response handler in an
error route, by setting the default status code to the same one as
the error status.

1 files changed, 9 insertions, 1 deletions

diff --git a/modules/caddyhttp/staticresp.go b/modules/caddyhttp/staticresp.go
index 3841a26..0a568fc 100644
--- a/modules/caddyhttp/staticresp.go
+++ b/modules/caddyhttp/staticresp.go
@@ -121,8 +121,16 @@ func (s StaticResponse) ServeHTTP(w http.ResponseWriter, r *http.Request, _ Hand
 		w.Header()["Content-Type"] = nil
 	}
 
-	// get the status code
+	// get the status code; if this handler exists in an error route,
+	// use the recommended status code as the default; otherwise 200
 	statusCode := http.StatusOK
+	if reqErr, ok := r.Context().Value(ErrorCtxKey).(error); ok {
+		if handlerErr, ok := reqErr.(HandlerError); ok {
+			if handlerErr.StatusCode > 0 {
+				statusCode = handlerErr.StatusCode
+			}
+		}
+	}
 	if codeStr := s.StatusCode.String(); codeStr != "" {
 		intVal, err := strconv.Atoi(repl.ReplaceAll(codeStr, ""))
 		if err != nil {