net/http/httputil: return after handling error

seankhliao · gopherbot · commit e64f7ef03fdf · 2024-11-18T16:43:40.000Z
Fixes #70237 Change-Id: Ieb22b6e7284cb4a40d4987b0e4b9cfb6e5158161 Reviewed-on: https://go-review.googlesource.com/c/go/+/627635 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Auto-Submit: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/src/net/http/httputil/reverseproxy.go b/src/net/http/httputil/reverseproxy.go
@@ -739,6 +739,7 @@ func (p *ReverseProxy) handleUpgradeResponse(rw http.ResponseWriter, req *http.R
 	resUpType := upgradeType(res.Header)
 	if !ascii.IsPrint(resUpType) { // We know reqUpType is ASCII, it's checked by the caller.
 		p.getErrorHandler()(rw, req, fmt.Errorf("backend tried to switch to invalid protocol %q", resUpType))
+		return
 	}
 	if !ascii.EqualFold(reqUpType, resUpType) {
 		p.getErrorHandler()(rw, req, fmt.Errorf("backend tried to switch protocol %q when %q was requested", resUpType, reqUpType))

Original file line number	Diff line number	Diff line change
`@@ -739,6 +739,7 @@ func (p ReverseProxy) handleUpgradeResponse(rw http.ResponseWriter, req http.R`
`739`	`739`	`resUpType := upgradeType(res.Header)`
`740`	`740`	`if !ascii.IsPrint(resUpType) { // We know reqUpType is ASCII, it's checked by the caller.`
`741`	`741`	`p.getErrorHandler()(rw, req, fmt.Errorf("backend tried to switch to invalid protocol %q", resUpType))`
	`742`	`+ return`
`742`	`743`	`}`
`743`	`744`	`if !ascii.EqualFold(reqUpType, resUpType) {`
`744`	`745`	`p.getErrorHandler()(rw, req, fmt.Errorf("backend tried to switch protocol %q when %q was requested", resUpType, reqUpType))`