Merge branch 'master' into 1728-log-rotate-compress

caddyserver · Jun 27, 2017 · 7aeaec6 · 7aeaec6
2 parents 3c8ec14 + 43b56d6
commit 7aeaec6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/caddyhttp/proxy/reverseproxy.go b/caddyhttp/proxy/reverseproxy.go
@@ -413,8 +413,12 @@ func copyHeader(dst, src http.Header) {
 			if _, shouldSkip := skipHeaders[k]; shouldSkip {
 				continue
 			}
-			// otherwise, overwrite
-			dst.Del(k)
+			// otherwise, overwrite to avoid duplicated fields that can be
+			// problematic (see issue #1086) -- however, allow duplicate
+			// Server fields so we can see the reality of the proxying.
+			if k != "Server" {
+				dst.Del(k)
+			}
 		}
 		for _, v := range vv {
 			dst.Add(k, v)