diff options
| author | Johan Brandhorst <johan.brandhorst@gmail.com> | 2020-11-12 20:34:51 +0000 |
|---|---|---|
| committer | Katie Hockman <katie@golang.org> | 2020-12-17 20:04:25 +0000 |
| commit | 520f3b72db7befab2028d9a47376267cf2d274a9 (patch) | |
| tree | 461fbaf1b007dc1a1f0e849286bf90f959916d4d /src/net/http/server.go | |
| parent | 2ff33f5e443165e55a080f3a649e4c070c4096d1 (diff) | |
| download | go-520f3b72db7befab2028d9a47376267cf2d274a9.tar.xz | |
crypto/tls: revert "add HandshakeContext method to Conn"
This reverts CL 246338.
Reason for revert: waiting for 1.17 release cycle
Updates #32406
Change-Id: I074379039041e086c62271d689b4b7f442281663
Reviewed-on: https://go-review.googlesource.com/c/go/+/269697
Run-TryBot: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
Run-TryBot: Katie Hockman <katie@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
Trust: Katie Hockman <katie@golang.org>
Trust: Roland Shoemaker <roland@golang.org>
Diffstat (limited to 'src/net/http/server.go')
| -rw-r--r-- | src/net/http/server.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/http/server.go b/src/net/http/server.go index 102e893d5f..ad99741177 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -1837,7 +1837,7 @@ func (c *conn) serve(ctx context.Context) { if d := c.server.WriteTimeout; d != 0 { c.rwc.SetWriteDeadline(time.Now().Add(d)) } - if err := tlsConn.HandshakeContext(ctx); err != nil { + if err := tlsConn.Handshake(); err != nil { // If the handshake failed due to the client not speaking // TLS, assume they're speaking plaintext HTTP and write a // 400 response on the TLS conn's underlying net.Conn. |