Skip to content

Commit 90c7274

Browse files
authored
Backport #3138 to v9.6 (#3145)
1 parent c3610cd commit 90c7274

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

internal/pool/conn.go

-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package pool
33
import (
44
"bufio"
55
"context"
6-
"crypto/tls"
76
"net"
87
"sync/atomic"
98
"syscall"
@@ -65,9 +64,6 @@ func (cn *Conn) setSysConn() {
6564
if conn == nil {
6665
return
6766
}
68-
if tlsConn, ok := conn.(*tls.Conn); ok {
69-
conn = tlsConn.NetConn()
70-
}
7167

7268
if sysConn, ok := conn.(syscall.Conn); ok {
7369
cn.sysConn = sysConn

internal/pool/conn_check_test.go

-20
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package pool
44

55
import (
6-
"crypto/tls"
76
"net"
87
"net/http/httptest"
98
"syscall"
@@ -16,21 +15,14 @@ import (
1615
var _ = Describe("tests conn_check with real conns", func() {
1716
var ts *httptest.Server
1817
var conn net.Conn
19-
var tlsConn *tls.Conn
2018
var sysConn syscall.Conn
21-
var tlsSysConn syscall.Conn
2219
var err error
2320

2421
BeforeEach(func() {
2522
ts = httptest.NewServer(nil)
2623
conn, err = net.DialTimeout(ts.Listener.Addr().Network(), ts.Listener.Addr().String(), time.Second)
2724
Expect(err).NotTo(HaveOccurred())
2825
sysConn = conn.(syscall.Conn)
29-
tlsTestServer := httptest.NewUnstartedServer(nil)
30-
tlsTestServer.StartTLS()
31-
tlsConn, err = tls.DialWithDialer(&net.Dialer{Timeout: time.Second}, tlsTestServer.Listener.Addr().Network(), tlsTestServer.Listener.Addr().String(), &tls.Config{InsecureSkipVerify: true})
32-
Expect(err).NotTo(HaveOccurred())
33-
tlsSysConn = tlsConn.NetConn().(syscall.Conn)
3426
})
3527

3628
AfterEach(func() {
@@ -44,23 +36,11 @@ var _ = Describe("tests conn_check with real conns", func() {
4436
Expect(connCheck(sysConn)).To(HaveOccurred())
4537
})
4638

47-
It("good tls conn check", func() {
48-
Expect(connCheck(tlsSysConn)).NotTo(HaveOccurred())
49-
50-
Expect(tlsConn.Close()).NotTo(HaveOccurred())
51-
Expect(connCheck(tlsSysConn)).To(HaveOccurred())
52-
})
53-
5439
It("bad conn check", func() {
5540
Expect(conn.Close()).NotTo(HaveOccurred())
5641
Expect(connCheck(sysConn)).To(HaveOccurred())
5742
})
5843

59-
It("bad tls conn check", func() {
60-
Expect(tlsConn.Close()).NotTo(HaveOccurred())
61-
Expect(connCheck(tlsSysConn)).To(HaveOccurred())
62-
})
63-
6444
It("check conn deadline", func() {
6545
Expect(conn.SetDeadline(time.Now())).NotTo(HaveOccurred())
6646
time.Sleep(time.Millisecond * 10)

0 commit comments

Comments
 (0)