Merge pull request #574 from panjf2000/dev

patch: v2.4.2
panjf2000 · Apr 15, 2024 · 35c7b3b · 35c7b3b
2 parents 4fee147 + 601bfdf
commit 35c7b3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/connection_unix.go b/connection_unix.go
@@ -149,7 +149,7 @@ func (c *conn) write(data []byte) (n int, err error) {
 			logging.Errorf("failed to close connection(fd=%d,peer=%+v) on conn.write: %v",
 				c.fd, c.remoteAddr, err)
 		}
-		return -1, os.NewSyscallError("write", err)
+		return 0, os.NewSyscallError("write", err)
 	}
 	// Failed to send all data back to the peer, buffer the leftover data for the next round.
 	if sent < n {
@@ -183,7 +183,7 @@ func (c *conn) writev(bs [][]byte) (n int, err error) {
 			logging.Errorf("failed to close connection(fd=%d,peer=%+v) on conn.writev: %v",
 				c.fd, c.remoteAddr, err)
 		}
-		return -1, os.NewSyscallError("writev", err)
+		return 0, os.NewSyscallError("writev", err)
 	}
 	// Failed to send all data back to the peer, buffer the leftover data for the next round.
 	if sent < n {

diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -100,7 +100,7 @@ func (el *eventloop) open(c *conn) error {
 	}
 
 	if !c.outboundBuffer.IsEmpty() {
-		if err := el.poller.AddWrite(&c.pollAttachment); err != nil {
+		if err := el.poller.ModReadWrite(&c.pollAttachment); err != nil {
 			return err
 		}
 	}