From d9d8d4c62c658f7c4015c73fcb2a1b809dbc0182 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 14 May 2013 21:21:11 -0700 Subject: [PATCH] cmd/godoc: don't warn about HEAD requests Fixes #5451 R=gri CC=dsymonds, gobot, golang-dev https://golang.org/cl/9388043 --- src/cmd/godoc/godoc.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go index 26b0b97e17..79d485b93d 100644 --- a/src/cmd/godoc/godoc.go +++ b/src/cmd/godoc/godoc.go @@ -642,7 +642,9 @@ func servePage(w http.ResponseWriter, page Page) { page.SearchBox = *indexEnabled page.Playground = *showPlayground page.Version = runtime.Version() - if err := godocHTML.Execute(w, page); err != nil { + if err := godocHTML.Execute(w, page); err != nil && err != http.ErrBodyNotAllowed { + // Only log if there's an error that's not about writing on HEAD requests. + // See Issues 5451 and 5454. log.Printf("godocHTML.Execute: %s", err) } } @@ -860,7 +862,9 @@ func serveSearchDesc(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{ "BaseURL": fmt.Sprintf("http://%s", r.Host), } - if err := searchDescXML.Execute(w, &data); err != nil { + if err := searchDescXML.Execute(w, &data); err != nil && err != http.ErrBodyNotAllowed { + // Only log if there's an error that's not about writing on HEAD requests. + // See Issues 5451 and 5454. log.Printf("searchDescXML.Execute: %s", err) } } -- 2.48.1