MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-13 07:53:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

server/mux: Close the connection even if buffer.Flush() returns error. (#3599)

Browse Source 
It is possible that buf.Flush() might return an error, leading to a
potential leak in active sockets.
This commit is contained in:
Harshavardhana 2017-01-19 11:19:57 -08:00 committed by GitHub
parent 9e1f1b50e0
commit a17f1e875c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/server-mux.go
View File

@ -108,10 +108,12 @@ func (c *ConnMux) Read(b []byte) (int, error) {
// Close the connection. // Close the connection.
func (c *ConnMux) Close() (err error) { func (c *ConnMux) Close() (err error) {
if err = c.bufrw.Flush(); err != nil { // Make sure that we always close a connection,
return err // even if the bufioWriter flush sends an error.
} defer c.Conn.Close()
return c.Conn.Close()
// Flush and write to the connection.
return c.bufrw.Flush()
} }
// ListenerMux wraps the standard net.Listener to inspect // ListenerMux wraps the standard net.Listener to inspect