aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hodges <jeff@somethingsimilar.com>2019-08-22 06:51:44 +0000
committerAndrew Bonventre <andybons@golang.org>2019-08-22 17:40:45 +0000
commitd76bd214aeb28df963f5b49ac07a39853b5b4cb3 (patch)
treefe3d9d74eb918d424452910f906c3cdb9dc729ac
parentbd2e28190d4dcb710eb2d6c7026aa4bd40301383 (diff)
downloadgo-d76bd214aeb28df963f5b49ac07a39853b5b4cb3.tar.gz
go-d76bd214aeb28df963f5b49ac07a39853b5b4cb3.zip
[release-branch.go1.13] net/http: change TimeoutHandler's docs to match its new interfaces
As of Go 1.13rc1, TimeoutHandler supports the Flusher and Pusher interfaces and this change corrects its documentation to say that. Fixes #33769 Updates #29193 Change-Id: Ia0523f7f2e3dc1f8f0b68950b85a7bf81c4abe60 GitHub-Last-Rev: 5310d2c9608a1af2d3030a9573e920906c76744e GitHub-Pull-Request: golang/go#33770 Reviewed-on: https://go-review.googlesource.com/c/go/+/191237 Reviewed-by: Andrew Bonventre <andybons@golang.org> Run-TryBot: Andrew Bonventre <andybons@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> (cherry picked from commit f3e3b71a50d7a247d07cc4e4295ec2dc44b04b6a) Reviewed-on: https://go-review.googlesource.com/c/go/+/191169 Reviewed-by: Bryan C. Mills <bcmills@google.com>
-rw-r--r--src/net/http/server.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/http/server.go b/src/net/http/server.go
index bcc283b66c..2eb16ff632 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -3177,8 +3177,8 @@ func (srv *Server) onceSetNextProtoDefaults() {
// After such a timeout, writes by h to its ResponseWriter will return
// ErrHandlerTimeout.
//
-// TimeoutHandler buffers all Handler writes to memory and does not
-// support the Hijacker or Flusher interfaces.
+// TimeoutHandler supports the Flusher and Pusher interfaces but does not
+// support the Hijacker interface.
func TimeoutHandler(h Handler, dt time.Duration, msg string) Handler {
return &timeoutHandler{
handler: h,