sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

mediaapi/writers/download: Remove unnecessary closeConnection()

Browse source
This commit is contained in:
Robert Swain 2017-05-31 15:39:19 +02:00
parent bd96d99a3a
commit 2e013e3408
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
View file

@ -208,22 +208,7 @@ func (r *downloadRequest) respondFromLocalFile(w http.ResponseWriter, absBasePat
} }
} }
// If we have written any data then we have already responded with 200 OK and all we can do is close the connection // If we have written any data then we have already responded with 200 OK and all we can do is close the connection
// FIXME: close the connection here or just return? return nil
r.closeConnection(w)
} }
return nil return nil
} }
func (r *downloadRequest) closeConnection(w http.ResponseWriter) {
r.Logger.Info("Attempting to close the connection.")
hijacker, ok := w.(http.Hijacker)
if ok {
connection, _, hijackErr := hijacker.Hijack()
if hijackErr == nil {
r.Logger.Info("Closing")
connection.Close()
} else {
r.Logger.WithError(hijackErr).Warn("Error trying to hijack and close connection")
}
}
}