From b6e10e3cb22990eaa0d9ff28256054a25efd25be Mon Sep 17 00:00:00 2001 From: Adam Williams Date: Fri, 15 Sep 2017 04:42:22 +0100 Subject: [PATCH] Revert "Implement Caddy-Sponsors HTTP response header" (#1866) This reverts commit 56453e9664aa2c24115eb52a4e933febb3cac1f7. --- caddyhttp/header/header.go | 4 ---- caddyhttp/httpserver/server.go | 2 -- 2 files changed, 6 deletions(-) diff --git a/caddyhttp/header/header.go b/caddyhttp/header/header.go index 6a60eacf..3967dd38 100644 --- a/caddyhttp/header/header.go +++ b/caddyhttp/header/header.go @@ -27,10 +27,6 @@ func (h Headers) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) for _, rule := range h.Rules { if httpserver.Path(r.URL.Path).Matches(rule.Path) { for name := range rule.Headers { - if name == "Caddy-Sponsors" || name == "-Caddy-Sponsors" { - // see EULA - continue - } // One can either delete a header, add multiple values to a header, or simply // set a header. diff --git a/caddyhttp/httpserver/server.go b/caddyhttp/httpserver/server.go index 6096a133..6a51aa9c 100644 --- a/caddyhttp/httpserver/server.go +++ b/caddyhttp/httpserver/server.go @@ -343,8 +343,6 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { r = r.WithContext(c) w.Header().Set("Server", caddy.AppName) - sponsors := "Minio, Uptime Robot, and Sourcegraph" - w.Header().Set("Caddy-Sponsors", "This free web server is made possible by its sponsors: "+sponsors) status, _ := s.serveHTTP(w, r)