From e0324fcdb510ad91eaeb1f9bd7a1b7d564f7c549 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 3 May 2024 14:12:39 +0200 Subject: [PATCH] http2: use net.ErrClosed Use errors.Is(err, net.ErrClosed) instead of checking for a known string. net.ErrClosed is available since Go 1.16, the current minimum version in go.mod is Go 1.18. For golang/go#4373 Change-Id: Id98771874434bae7d9c6d1d4d36fddb28822eb39 Reviewed-on: https://go-review.googlesource.com/c/net/+/583016 Auto-Submit: Tobias Klauser Reviewed-by: Damien Neil Reviewed-by: Cherry Mui LUCI-TryBot-Result: Go LUCI --- http2/server.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/http2/server.go b/http2/server.go index 278add72b..c5d081081 100644 --- a/http2/server.go +++ b/http2/server.go @@ -732,11 +732,7 @@ func isClosedConnError(err error) bool { return false } - // TODO: remove this string search and be more like the Windows - // case below. That might involve modifying the standard library - // to return better error types. - str := err.Error() - if strings.Contains(str, "use of closed network connection") { + if errors.Is(err, net.ErrClosed) { return true }