Revert "0.10.9-2 remove sponsor response header"

This reverts commit f6a0a6ae87eace7d5a7ca3c55c7e7b1bfb9e276c.

3 files changed, 4 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df9369f64d66..0c30797df626 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = caddy
 	pkgdesc = HTTP/2 Web Server with Automatic HTTPS
 	pkgver = 0.10.9
-	pkgrel = 2
+	pkgrel = 1
 	url = https://caddyserver.com
 	install = caddy.install
 	arch = i686
@@ -19,7 +19,6 @@ pkgbase = caddy
 	source = caddy.tmpfiles
 	source = caddy.conf
 	source = plugins.go
-	source = remove-sponsors-header.patch
 	sha256sums = be70a4324e3f6cd4da5e379b31562d07f40f6e39439c7274d4bb94fe482b86e4
 	sha256sums = e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85
 	sha256sums = 6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7
@@ -27,7 +26,6 @@ pkgbase = caddy
 	sha256sums = bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce
 	sha256sums = 80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64
 	sha256sums = f5a0fbb961e7c9ecf99e88d0959a3164cbea54660c1c08c3ba3cdf1d45563929
-	sha256sums = d75c846fd7565a229040f9c80b35db4a870905772ac95d41066a53695392be74
 
 pkgname = caddy
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a9cb6f64d32..27e6497dbc8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _gopkgname='github.com/mholt/caddy'
 
 pkgname=caddy
 pkgver=0.10.9
-pkgrel=2
+pkgrel=1
 pkgdesc='HTTP/2 Web Server with Automatic HTTPS'
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url='https://caddyserver.com'
@@ -21,16 +21,14 @@ source=("https://$_gopkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
         'caddy.service'
         'caddy.tmpfiles'
         'caddy.conf'
-        'plugins.go'
-        'remove-sponsors-header.patch')
+        'plugins.go')
 sha256sums=('be70a4324e3f6cd4da5e379b31562d07f40f6e39439c7274d4bb94fe482b86e4'
             'e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85'
             '6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7'
             '69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9'
             'bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce'
             '80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64'
-            'f5a0fbb961e7c9ecf99e88d0959a3164cbea54660c1c08c3ba3cdf1d45563929'
-            'd75c846fd7565a229040f9c80b35db4a870905772ac95d41066a53695392be74')
+            'f5a0fbb961e7c9ecf99e88d0959a3164cbea54660c1c08c3ba3cdf1d45563929')
 
 patch_plugins() {
     IFS=''
@@ -45,8 +43,6 @@ patch_plugins() {
 }
 
 prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -Np1 < ../remove-sponsors-header.patch
     export GOPATH="$srcdir/build"
     rm -rf "$GOPATH/src/$gopkgname"
     mkdir --parents `dirname "$GOPATH/src/$_gopkgname"`
diff --git a/remove-sponsors-header.patch b/remove-sponsors-header.patch
deleted file mode 100644
index 5ff10742ccb6..000000000000
--- a/remove-sponsors-header.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/caddyhttp/header/header.go b/caddyhttp/header/header.go
-index 6a60eac..3967dd3 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 6096a13..6a51aa9 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)
- 
---