Skip to content

Commit 97dda76

Browse files
committed
1 parent 81854a6 commit 97dda76

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

server.go

+4-11
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ type Listener interface {
103103
}
104104

105105
func transport(rw1, rw2 io.ReadWriter) error {
106-
errc := make(chan error, 2)
106+
errc := make(chan error, 1)
107107
go func() {
108108
errc <- copyBuffer(rw1, rw2)
109109
}()
@@ -112,18 +112,11 @@ func transport(rw1, rw2 io.ReadWriter) error {
112112
errc <- copyBuffer(rw2, rw1)
113113
}()
114114

115-
err := <-errc
116-
err2 := <-errc
117-
if err != nil && err == io.EOF {
118-
err = nil
119-
}
120-
if err != nil {
115+
if err := <-errc; err != nil && err != io.EOF {
121116
return err
122117
}
123-
if err2 != nil && err2 == io.EOF {
124-
err2 = nil
125-
}
126-
return err2
118+
119+
return nil
127120
}
128121

129122
func copyBuffer(dst io.Writer, src io.Reader) error {

0 commit comments

Comments
 (0)