Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch: v2.4.2 #574

Merged
merged 2 commits into from
Apr 15, 2024
Merged

patch: v2.4.2 #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ded75
bug: return 0 instead of -1 when error occurred on a write (#569)
daynobug Apr 5, 2024
601bfdf
bug: fix the EEXIST of epoll_ctl in eventloop.open (#572)
panjf2000 Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions connection_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion eventloop_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Loading