reader return io.EOF if writer stops

aojea · aojea · commit 32758d0b7ad4 · 2022-08-30T10:34:58.000+02:00
diff --git a/conn.go b/conn.go
@@ -81,6 +81,7 @@ func (c *RWConn) asyncRead() {
 			}
 		}
 		if err != nil {
+			close(c.rx)
 			c.Close()
 			return
 		}
@@ -140,16 +141,14 @@ func (c *RWConn) Read(data []byte) (int, error) {
 
 	switch {
 	case isClosedChan(c.done):
-		return 0, io.ErrClosedPipe
+		return 0, io.EOF
 	case isClosedChan(c.readDeadline.wait()):
 		return 0, os.ErrDeadlineExceeded
 	}
 
 	select {
 	case <-c.done:
-		// TODO: TestConn/BasicIO the other end stops writing and the http connection is closed
-		// closing this connection that is blocked on read.
-		return 0, io.EOF
+		return 0, io.ErrClosedPipe
 	case <-c.readDeadline.wait():
 		return 0, os.ErrDeadlineExceeded
 	case d, ok := <-c.rx:

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ func (c *RWConn) asyncRead() {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`if err != nil {`
	`84`	`+ close(c.rx)`
`84`	`85`	`c.Close()`
`85`	`86`	`return`
`86`	`87`	`}`
`@@ -140,16 +141,14 @@ func (c *RWConn) Read(data []byte) (int, error) {`
`140`	`141`
`141`	`142`	`switch {`
`142`	`143`	`case isClosedChan(c.done):`
`143`		`- return 0, io.ErrClosedPipe`
	`144`	`+ return 0, io.EOF`
`144`	`145`	`case isClosedChan(c.readDeadline.wait()):`
`145`	`146`	`return 0, os.ErrDeadlineExceeded`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`select {`
`149`	`150`	`case <-c.done:`
`150`		`- // TODO: TestConn/BasicIO the other end stops writing and the http connection is closed`
`151`		`- // closing this connection that is blocked on read.`
`152`		`- return 0, io.EOF`
	`151`	`+ return 0, io.ErrClosedPipe`
`153`	`152`	`case <-c.readDeadline.wait():`
`154`	`153`	`return 0, os.ErrDeadlineExceeded`
`155`	`154`	`case d, ok := <-c.rx:`