0.11.3

3 files changed, 26 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4685c1c3907d..bfeb4cb98c05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = caddy-with-cgi
 	pkgdesc = HTTP/2 Web Server with Automatic HTTPS, with caddy-cgi plugin and gcc-go support
-	pkgver = 0.11.2
+	pkgver = 0.11.3
 	pkgrel = 1
 	url = https://caddyserver.com
 	install = caddy.install
@@ -13,7 +13,7 @@ pkgbase = caddy-with-cgi
 	provides = caddy
 	conflicts = caddy
 	backup = etc/caddy/caddy.conf
-	source = https://github.com/mholt/caddy/archive/v0.11.2/caddy-0.11.2.tar.gz
+	source = https://github.com/mholt/caddy/archive/v0.11.3/caddy-0.11.3.tar.gz
 	source = https://github.com/jung-kurt/caddy-cgi/archive/v1.10.tar.gz
 	source = https://caddyserver.com/resources/images/brand/caddy-at-your-service-white.svg
 	source = index.html
@@ -22,14 +22,14 @@ pkgbase = caddy-with-cgi
 	source = caddy.conf
 	source = noquic_aesni.patch
 	source = plugins.patch
-	sha256sums = 61779a09959bf6a0e7007e8ff5c2a94811dd12b7628166cb31e9648a97c0e75b
+	sha256sums = b99973614b85f55da309cdf79e5d6c9aae8ad1bd83c425b1f1fd17b21386eab6
 	sha256sums = 4cb13ce2862dbd00e4a97342d5f20bc759e2c1b7983f866aa4b6d421df65249b
 	sha256sums = e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85
 	sha256sums = 6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7
 	sha256sums = 69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9
 	sha256sums = bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce
 	sha256sums = 80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64
-	sha256sums = 0874307e09dff107ea8e1e6481ccef89363154696f30b79e0469f49e8d370d32
+	sha256sums = f3f9fa975a174928d727f3040fa28e2fbd073b1f4ebd3a68fa43b0aebb90eb64
 	sha256sums = c8d56b2295e04720ae8fe9493a7931bb2dba5c568fbcae469887ac143bd6b934
 
 pkgname = caddy-with-cgi
diff --git a/PKGBUILD b/PKGBUILD
index e435ba4880f3..eee7e2513899 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ fi
 
 pkgname=caddy-with-cgi
 _pkgbase=caddy
-pkgver=0.11.2
+pkgver=0.11.3
 _cgiver=1.10
 pkgrel=1
 pkgdesc='HTTP/2 Web Server with Automatic HTTPS, with caddy-cgi plugin and gcc-go support'
@@ -37,14 +37,14 @@ source=("https://$_gopkgname/archive/v$pkgver/$_pkgbase-$pkgver.tar.gz"
 	'caddy.conf'
 	'noquic_aesni.patch'
 	'plugins.patch')
-sha256sums=('61779a09959bf6a0e7007e8ff5c2a94811dd12b7628166cb31e9648a97c0e75b'
+sha256sums=('b99973614b85f55da309cdf79e5d6c9aae8ad1bd83c425b1f1fd17b21386eab6'
 	'4cb13ce2862dbd00e4a97342d5f20bc759e2c1b7983f866aa4b6d421df65249b'
 	'e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85'
 	'6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7'
 	'69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9'
 	'bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce'
 	'80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64'
-	'0874307e09dff107ea8e1e6481ccef89363154696f30b79e0469f49e8d370d32'
+	'f3f9fa975a174928d727f3040fa28e2fbd073b1f4ebd3a68fa43b0aebb90eb64'
 	'c8d56b2295e04720ae8fe9493a7931bb2dba5c568fbcae469887ac143bd6b934')
 
 prepare() {
diff --git a/noquic_aesni.patch b/noquic_aesni.patch
index cd246168a22c..c684559e3551 100644
--- a/noquic_aesni.patch
+++ b/noquic_aesni.patch
@@ -1,5 +1,5 @@
 diff --git a/caddyhttp/httpserver/server.go b/caddyhttp/httpserver/server.go
-index 800f921..6b9f690 100644
+index de53cea..1b58e04 100644
 --- a/caddyhttp/httpserver/server.go
 +++ b/caddyhttp/httpserver/server.go
 @@ -32,7 +32,6 @@ import (
@@ -39,7 +39,7 @@ index 800f921..6b9f690 100644
  		previousHandler.ServeHTTP(w, r)
  	}
  }
-@@ -323,18 +314,11 @@ func (s *Server) Serve(ln net.Listener) error {
+@@ -333,18 +324,11 @@ func (s *Server) Serve(ln net.Listener) error {
  	if err == http.ErrServerClosed {
  		err = nil // not an error worth reporting since closing a server is intentional
  	}
@@ -59,10 +59,10 @@ index 800f921..6b9f690 100644
  }
  
 diff --git a/caddyhttp/proxy/reverseproxy.go b/caddyhttp/proxy/reverseproxy.go
-index 4de24ea..a7eb9da 100644
+index 14d4bd7..d8d0622 100644
 --- a/caddyhttp/proxy/reverseproxy.go
 +++ b/caddyhttp/proxy/reverseproxy.go
-@@ -39,8 +39,6 @@ import (
+@@ -40,8 +40,6 @@ import (
  
  	"golang.org/x/net/http2"
  
@@ -71,7 +71,7 @@ index 4de24ea..a7eb9da 100644
  	"github.com/mholt/caddy/caddyhttp/httpserver"
  )
  
-@@ -245,13 +243,6 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int, t
+@@ -250,13 +248,6 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int, t
  		rp.Transport = &http.Transport{
  			Dial: socketDial(target.String(), timeout),
  		}
@@ -85,7 +85,7 @@ index 4de24ea..a7eb9da 100644
  	} else if keepalive != http.DefaultMaxIdleConnsPerHost || strings.HasPrefix(target.Scheme, "srv") {
  		dialFunc := rp.dialer.Dial
  		if strings.HasPrefix(target.Scheme, "srv") {
-@@ -298,11 +289,6 @@ func (rp *ReverseProxy) UseInsecureTransport() {
+@@ -303,11 +294,6 @@ func (rp *ReverseProxy) UseInsecureTransport() {
  		// No http2.ConfigureTransport() here.
  		// For now this is only added in places where
  		// an http.Transport is actually created.
@@ -97,7 +97,19 @@ index 4de24ea..a7eb9da 100644
  	}
  }
  
-@@ -316,10 +302,6 @@ func (rp *ReverseProxy) ServeHTTP(rw http.ResponseWriter, outreq *http.Request,
+@@ -322,11 +308,6 @@ func (rp *ReverseProxy) UseOwnCACertificates(CaCertPool *x509.CertPool) {
+ 		// No http2.ConfigureTransport() here.
+ 		// For now this is only added in places where
+ 		// an http.Transport is actually created.
+-	} else if transport, ok := rp.Transport.(*h2quic.RoundTripper); ok {
+-		if transport.TLSClientConfig == nil {
+-			transport.TLSClientConfig = &tls.Config{}
+-		}
+-		transport.TLSClientConfig.RootCAs = CaCertPool
+ 	}
+ }
+ 
+@@ -340,10 +321,6 @@ func (rp *ReverseProxy) ServeHTTP(rw http.ResponseWriter, outreq *http.Request,
  
  	rp.Director(outreq)