Lint: fix SA1019 http.CloseNotifier is duprecated of staticcheck caddyserver#2541

Author: u5surf

caddyhttp/httpserver/responsewriterwrapper.go

@@ -21,7 +21,7 @@ import (
 )
 
 // ResponseWriterWrapper wrappers underlying ResponseWriter
-// and inherits its Hijacker/Pusher/CloseNotifier/Flusher as well.
+// and inherits its Hijacker/Pusher/Flusher as well.
 type ResponseWriterWrapper struct {
 	http.ResponseWriter
 }
@@ -45,16 +45,6 @@ func (rww *ResponseWriterWrapper) Flush() {
 	}
 }
 
-// CloseNotify implements http.CloseNotifier.
-// It just inherits the underlying ResponseWriter's CloseNotify method.
-// It panics if the underlying ResponseWriter is not a CloseNotifier.
-func (rww *ResponseWriterWrapper) CloseNotify() <-chan bool {
-	if cn, ok := rww.ResponseWriter.(http.CloseNotifier); ok {
-		return cn.CloseNotify()
-	}
-	panic(NonCloseNotifierError{Underlying: rww.ResponseWriter})
-}
-
 // Push implements http.Pusher.
 // It just inherits the underlying ResponseWriter's Push method.
 // It panics if the underlying ResponseWriter is not a Pusher.
@@ -71,7 +61,6 @@ type HTTPInterfaces interface {
 	http.ResponseWriter
 	http.Pusher
 	http.Flusher
-	http.CloseNotifier
 	http.Hijacker
 }
 

caddyhttp/proxy/proxy.go

@@ -313,16 +313,6 @@ func createUpstreamRequest(rw http.ResponseWriter, r *http.Request) (*http.Reque
 	// Original incoming server request may be canceled by the
 	// user or by std lib(e.g. too many idle connections).
 	ctx, cancel := context.WithCancel(r.Context())
-	if cn, ok := rw.(http.CloseNotifier); ok {
-		notifyChan := cn.CloseNotify()
-		go func() {
-			select {
-			case <-notifyChan:
-				cancel()
-			case <-ctx.Done():
-			}
-		}()
-	}
 
 	outreq := r.WithContext(ctx) // includes shallow copies of maps, but okay
 

caddyhttp/proxy/proxy_test.go

@@ -1361,13 +1361,6 @@ func TestCancelRequest(t *testing.T) {
 	backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		close(reqInFlight) // cause the client to cancel its request
 
-		select {
-		case <-time.After(10 * time.Second):
-			t.Error("Handler never saw CloseNotify")
-			return
-		case <-w.(http.CloseNotifier).CloseNotify():
-		}
-
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("Hello, client"))
 	}))