caddyhttp: Only attempt to enable full duplex for HTTP/1.x (#6102)

francislavoie · web-flow · commit 2c48dda109d2 · 2024-02-13T13:45:38.000-05:00
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go
@@ -301,11 +301,11 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// enable full-duplex for HTTP/1, ensuring the entire
 	// request body gets consumed before writing the response
-	if s.EnableFullDuplex {
+	if s.EnableFullDuplex && r.ProtoMajor == 1 {
 		//nolint:bodyclose
 		err := http.NewResponseController(w).EnableFullDuplex()
 		if err != nil {
-			s.accessLogger.Warn("failed to enable full duplex", zap.Error(err))
+			s.logger.Warn("failed to enable full duplex", zap.Error(err))
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -301,11 +301,11 @@ func (s Server) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`301`	`301`
`302`	`302`	`// enable full-duplex for HTTP/1, ensuring the entire`
`303`	`303`	`// request body gets consumed before writing the response`
`304`		`- if s.EnableFullDuplex {`
	`304`	`+ if s.EnableFullDuplex && r.ProtoMajor == 1 {`
`305`	`305`	`//nolint:bodyclose`
`306`	`306`	`err := http.NewResponseController(w).EnableFullDuplex()`
`307`	`307`	`if err != nil {`
`308`		`- s.accessLogger.Warn("failed to enable full duplex", zap.Error(err))`
	`308`	`+ s.logger.Warn("failed to enable full duplex", zap.Error(err))`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`