diff options
Diffstat (limited to 'noquic_aesni.patch')
| -rw-r--r-- | noquic_aesni.patch | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/noquic_aesni.patch b/noquic_aesni.patch index eca192a372d3..d7bf215c8dd0 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 7940ac8..71cc657 100644 +index 5368407b..be52e360 100644 --- a/caddyhttp/httpserver/server.go +++ b/caddyhttp/httpserver/server.go @@ -31,7 +31,6 @@ import ( @@ -7,9 +7,9 @@ index 7940ac8..71cc657 100644 "time" - "github.com/lucas-clemente/quic-go/h2quic" - "github.com/mholt/caddy" - "github.com/mholt/caddy/caddyhttp/staticfiles" - "github.com/mholt/caddy/caddytls" + "github.com/caddyserver/caddy" + "github.com/caddyserver/caddy/caddyhttp/staticfiles" + "github.com/caddyserver/caddy/caddytls" @@ -41,7 +40,6 @@ import ( // Server is the HTTP server implementation. type Server struct { @@ -18,15 +18,20 @@ index 7940ac8..71cc657 100644 sites []*SiteConfig connTimeout time.Duration // max time to wait for a connection before force stop tlsGovChan chan struct{} // close to stop the TLS maintenance goroutine -@@ -104,7 +102,6 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) { +@@ -102,12 +100,6 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) { + + // if TLS is enabled, make sure we prepare the Server accordingly if s.Server.TLSConfig != nil { - // enable QUIC if desired (requires HTTP/2) - if HTTP2 && QUIC { +- // enable QUIC if desired (requires HTTP/2) +- if HTTP2 && QUIC { - s.quicServer = &h2quic.Server{Server: s.Server} - s.Server.Handler = s.wrapWithSvcHeaders(s.Server.Handler) - } - -@@ -234,9 +231,6 @@ func makeHTTPServerWithTimeouts(addr string, group []*SiteConfig) *http.Server { +- s.Server.Handler = s.wrapWithSvcHeaders(s.Server.Handler) +- } +- + // wrap the HTTP handler with a handler that does MITM detection + tlsh := &tlsHandler{next: s.Server.Handler} + s.Server.Handler = tlsh // this needs to be the "outer" handler when Serve() is called, for type assertion +@@ -234,9 +226,6 @@ func makeHTTPServerWithTimeouts(addr string, group []*SiteConfig) *http.Server { func (s *Server) wrapWithSvcHeaders(previousHandler http.Handler) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { @@ -36,7 +41,7 @@ index 7940ac8..71cc657 100644 previousHandler.ServeHTTP(w, r) } } -@@ -324,14 +318,6 @@ func (s *Server) Serve(ln net.Listener) error { +@@ -324,14 +313,6 @@ func (s *Server) Serve(ln net.Listener) error { s.tlsGovChan = caddytls.RotateSessionTicketKeys(s.Server.TLSConfig) } @@ -51,7 +56,7 @@ index 7940ac8..71cc657 100644 err := s.Server.Serve(ln) if err != nil && err != http.ErrServerClosed { return err -@@ -341,10 +327,6 @@ func (s *Server) Serve(ln net.Listener) error { +@@ -341,10 +322,6 @@ func (s *Server) Serve(ln net.Listener) error { // ServePacket serves QUIC requests on pc until it is closed. func (s *Server) ServePacket(pc net.PacketConn) error { @@ -63,7 +68,7 @@ index 7940ac8..71cc657 100644 } diff --git a/caddyhttp/proxy/reverseproxy.go b/caddyhttp/proxy/reverseproxy.go -index c20be0c..884fd4d 100644 +index a223d353..a4dfd056 100644 --- a/caddyhttp/proxy/reverseproxy.go +++ b/caddyhttp/proxy/reverseproxy.go @@ -41,8 +41,6 @@ import ( @@ -72,7 +77,7 @@ index c20be0c..884fd4d 100644 - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/h2quic" - "github.com/mholt/caddy/caddyhttp/httpserver" + "github.com/caddyserver/caddy/caddyhttp/httpserver" ) @@ -253,13 +251,6 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int, t |