reverseproxy: Apply response header ops before copying it (fix #3382) (#3401)

1 files changed, 9 insertions, 9 deletions

diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go
index 9e0f636..0b4bcdf 100644
--- a/modules/caddyhttp/reverseproxy/reverseproxy.go
+++ b/modules/caddyhttp/reverseproxy/reverseproxy.go
@@ -510,6 +510,15 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, di Dia
 		res.Header.Del(h)
 	}
 
+	// apply any response header operations
+	if h.Headers != nil && h.Headers.Response != nil {
+		if h.Headers.Response.Require == nil ||
+			h.Headers.Response.Require.Match(res.StatusCode, res.Header) {
+			repl := req.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
+			h.Headers.Response.ApplyTo(res.Header, repl)
+		}
+	}
+
 	copyHeader(rw.Header(), res.Header)
 
 	// The "Trailer" header isn't included in the Transport's response,
@@ -523,15 +532,6 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, di Dia
 		rw.Header().Add("Trailer", strings.Join(trailerKeys, ", "))
 	}
 
-	// apply any response header operations
-	if h.Headers != nil && h.Headers.Response != nil {
-		if h.Headers.Response.Require == nil ||
-			h.Headers.Response.Require.Match(res.StatusCode, rw.Header()) {
-			repl := req.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
-			h.Headers.Response.ApplyTo(rw.Header(), repl)
-		}
-	}
-
 	// TODO: there should be an option to return an error if the response
 	// matches some criteria; would solve https://github.com/caddyserver/caddy/issues/1447
 	// by allowing the backend to determine whether this server should treat