From c44066c5c816ec500d459a2a324a753f78531ae0 Mon Sep 17 00:00:00 2001 From: Igor Zhilianin Date: Mon, 29 Oct 2018 02:24:31 +0000 Subject: [PATCH] http2: fix typos Change-Id: Ifa39718a790a7350a0c8f23d21356d42b15e0668 GitHub-Last-Rev: 63d19182f013827cc15533b743fb08b526ca3dd2 GitHub-Pull-Request: golang/net#22 Reviewed-on: https://go-review.googlesource.com/c/145357 Reviewed-by: Brad Fitzpatrick --- http2/frame.go | 2 +- http2/h2c/h2c.go | 2 +- http2/server.go | 2 +- http2/write.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/http2/frame.go b/http2/frame.go index c85e31f2..b46791d1 100644 --- a/http2/frame.go +++ b/http2/frame.go @@ -1477,7 +1477,7 @@ func (fr *Framer) maxHeaderStringLen() int { } // readMetaFrame returns 0 or more CONTINUATION frames from fr and -// merge them into into the provided hf and returns a MetaHeadersFrame +// merge them into the provided hf and returns a MetaHeadersFrame // with the decoded hpack values. func (fr *Framer) readMetaFrame(hf *HeadersFrame) (*MetaHeadersFrame, error) { if fr.AllowIllegalReads { diff --git a/http2/h2c/h2c.go b/http2/h2c/h2c.go index f2d60f84..03a31c80 100644 --- a/http2/h2c/h2c.go +++ b/http2/h2c/h2c.go @@ -293,7 +293,7 @@ func (c *rwConn) Write(p []byte) (int, error) { return n, err } -// settingsAckSwallowWriter is a writer that normally forwards bytes to it's +// settingsAckSwallowWriter is a writer that normally forwards bytes to its // underlying Writer, but swallows the first SettingsAck frame that it sees. type settingsAckSwallowWriter struct { Writer *bufio.Writer diff --git a/http2/server.go b/http2/server.go index 56859d1f..174c89b7 100644 --- a/http2/server.go +++ b/http2/server.go @@ -1110,7 +1110,7 @@ func (sc *serverConn) startFrameWrite(wr FrameWriteRequest) { // errHandlerPanicked is the error given to any callers blocked in a read from // Request.Body when the main goroutine panics. Since most handlers read in the -// the main ServeHTTP goroutine, this will show up rarely. +// main ServeHTTP goroutine, this will show up rarely. var errHandlerPanicked = errors.New("http2: handler panicked") // wroteFrame is called on the serve goroutine with the result of diff --git a/http2/write.go b/http2/write.go index fae5c8ad..3849bc26 100644 --- a/http2/write.go +++ b/http2/write.go @@ -329,7 +329,7 @@ func (wu writeWindowUpdate) writeFrame(ctx writeContext) error { } // encodeHeaders encodes an http.Header. If keys is not nil, then (k, h[k]) -// is encoded only only if k is in keys. +// is encoded only if k is in keys. func encodeHeaders(enc *hpack.Encoder, h http.Header, keys []string) { if keys == nil { sorter := sorterPool.Get().(*sorter)