From 9237dbb1678ee88da4afba295d44d5d100a2fdc2 Mon Sep 17 00:00:00 2001
From: Glonee <glonee@foxmail.com>
Date: Thu, 1 Jun 2023 16:06:13 +0800
Subject: [PATCH] http3: close the connection when closing the roundtripper
 (#3873)

---
 http3/roundtrip.go                    | 7 ++++++-
 integrationtests/self/hotswap_test.go | 2 +-
 integrationtests/self/http_test.go    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/http3/roundtrip.go b/http3/roundtrip.go
index 0e11242a..066b762b 100644
--- a/http3/roundtrip.go
+++ b/http3/roundtrip.go
@@ -239,7 +239,12 @@ func (r *RoundTripper) Close() error {
 	}
 	r.clients = nil
 	if r.transport != nil {
-		r.transport.Close()
+		if err := r.transport.Close(); err != nil {
+			return err
+		}
+		if err := r.transport.Conn.Close(); err != nil {
+			return err
+		}
 		r.transport = nil
 	}
 	return nil
diff --git a/integrationtests/self/hotswap_test.go b/integrationtests/self/hotswap_test.go
index eeb16441..ac75a494 100644
--- a/integrationtests/self/hotswap_test.go
+++ b/integrationtests/self/hotswap_test.go
@@ -98,7 +98,7 @@ var _ = Describe("HTTP3 Server hotswap test", func() {
 	})
 
 	AfterEach(func() {
-		rt.Close()
+		Expect(rt.Close()).NotTo(HaveOccurred())
 		Expect(ln.Close()).NotTo(HaveOccurred())
 	})
 
diff --git a/integrationtests/self/http_test.go b/integrationtests/self/http_test.go
index 334af45d..f8d563b9 100644
--- a/integrationtests/self/http_test.go
+++ b/integrationtests/self/http_test.go
@@ -106,7 +106,7 @@ var _ = Describe("HTTP tests", func() {
 	})
 
 	AfterEach(func() {
-		rt.Close()
+		Expect(rt.Close()).NotTo(HaveOccurred())
 		Expect(server.Close()).NotTo(HaveOccurred())
 		Eventually(stoppedServing).Should(BeClosed())
 	})