From dbe7192ca3b8bc4a86547ae91c13854d5e8eb927 Mon Sep 17 00:00:00 2001 From: Abirdcfly Date: Mon, 25 Jul 2022 06:31:46 +0000 Subject: [PATCH] net/http: remove unused method needsSniff Change-Id: Ia8c67d148fc7e71cac8954ccce6fffb8a6f423df GitHub-Last-Rev: 9441b8f0c510a3a03dc22816e2616d57f1411965 GitHub-Pull-Request: golang/go#54036 Reviewed-on: https://go-review.googlesource.com/c/go/+/419322 Run-TryBot: Ian Lance Taylor Auto-Submit: Ian Lance Taylor Reviewed-by: Javad Rajabzadeh Reviewed-by: hopehook Reviewed-by: Ian Lance Taylor TryBot-Result: Gopher Robot Run-TryBot: Ian Lance Taylor Reviewed-by: Damien Neil --- src/net/http/response_test.go | 13 ------------- src/net/http/server.go | 6 ------ 2 files changed, 19 deletions(-) diff --git a/src/net/http/response_test.go b/src/net/http/response_test.go index 5a735b021587d5..2500e420dd55c2 100644 --- a/src/net/http/response_test.go +++ b/src/net/http/response_test.go @@ -972,19 +972,6 @@ func matchErr(err error, wantErr any) error { return fmt.Errorf("%v; want %v", err, wantErr) } -func TestNeedsSniff(t *testing.T) { - // needsSniff returns true with an empty response. - r := &response{} - if got, want := r.needsSniff(), true; got != want { - t.Errorf("needsSniff = %t; want %t", got, want) - } - // needsSniff returns false when Content-Type = nil. - r.handlerHeader = Header{"Content-Type": nil} - if got, want := r.needsSniff(), false; got != want { - t.Errorf("needsSniff empty Content-Type = %t; want %t", got, want) - } -} - // A response should only write out single Connection: close header. Tests #19499. func TestResponseWritesOnlySingleConnectionClose(t *testing.T) { const connectionCloseHeader = "Connection: close" diff --git a/src/net/http/server.go b/src/net/http/server.go index 960f7d64828278..f4149e41a32a63 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -555,12 +555,6 @@ func (w *response) requestTooLarge() { } } -// needsSniff reports whether a Content-Type still needs to be sniffed. -func (w *response) needsSniff() bool { - _, haveType := w.handlerHeader["Content-Type"] - return !w.cw.wroteHeader && !haveType && w.written < sniffLen -} - // writerOnly hides an io.Writer value's optional ReadFrom method // from io.Copy. type writerOnly struct {