MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 12:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set http server read/write timeout from --idle-timeout (#228) (#20715)

Browse Source 
Golang http.Server will call SetReadDeadline overwriting the previous
deadline configuration set after a new connection Accept in the custom
listener code. Therefore, --idle-timeout was not correctly respected.

Make http.Server read/write timeout similar to --idle-timeout.
This commit is contained in:
Anis Eleuch
2024-12-02 14:21:17 +01:00
committed by GitHub
parent abd6bf060d
commit b8dab7b1a9
5 changed files with 148 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/deadlineconn/deadlineconn.go
View File

@@ -114,8 +114,8 @@ func (c *DeadlineConn) SetDeadline(t time.Time) error {
c.mu.Lock()
defer c.mu.Unlock()
c.readSetAt = time.Now()
c.writeSetAt = time.Now()
c.readSetAt = time.Time{}
c.writeSetAt = time.Time{}
c.abortReads.Store(!t.IsZero() && time.Until(t) < 0)
c.abortWrites.Store(!t.IsZero() && time.Until(t) < 0)
c.infReads.Store(t.IsZero())
@@ -131,7 +131,7 @@ func (c *DeadlineConn) SetReadDeadline(t time.Time) error {
defer c.mu.Unlock()
c.abortReads.Store(!t.IsZero() && time.Until(t) < 0)
c.infReads.Store(t.IsZero())
c.readSetAt = time.Now()
c.readSetAt = time.Time{}
return c.Conn.SetReadDeadline(t)
}
@@ -145,7 +145,7 @@ func (c *DeadlineConn) SetWriteDeadline(t time.Time) error {
defer c.mu.Unlock()
c.abortWrites.Store(!t.IsZero() && time.Until(t) < 0)
c.infWrites.Store(t.IsZero())
c.writeSetAt = time.Now()
c.writeSetAt = time.Time{}
return c.Conn.SetWriteDeadline(t)
}