opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 18:13:54 +08:00
Code Issues Projects Releases Wiki Activity

gateway: apply review to serveFile

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2017-10-20 13:36:37 +02:00
parent 913f9641e4
commit cbccd847ab
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/corehttp/gateway_handler.go
View File

@ -268,7 +268,7 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
if !dir { if !dir {
name := gopath.Base(urlPath) name := gopath.Base(urlPath)
i.serverFile(w, r, name, modtime, dr) i.serveFile(w, r, name, modtime, dr)
return return
} }
@ -390,7 +390,7 @@ func (s *sizeSeeker) Seek(offset int64, whence int) (int64, error) {
return s.sizeReadSeeker.Seek(offset, whence) return s.sizeReadSeeker.Seek(offset, whence)
} }
func (i *gatewayHandler) serverFile(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) { func (i *gatewayHandler) serveFile(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
if sp, ok := content.(sizeReadSeeker); ok { if sp, ok := content.(sizeReadSeeker); ok {
content = &sizeSeeker{ content = &sizeSeeker{
sizeReadSeeker: sp, sizeReadSeeker: sp,
@ -398,13 +398,6 @@ func (i *gatewayHandler) serverFile(w http.ResponseWriter, req *http.Request, na
} }
http.ServeContent(w, req, name, modtime, content) http.ServeContent(w, req, name, modtime, content)
//TODO: check for errors in ServeContent.. somehow
// If http.ServeContent can't figure out content size it won't write it to the
// responseWriter, Content-Length not being set is a good indicator of this
if req.Method != "HEAD" && w.Header().Get("Content-Length") == "" {
io.Copy(w, content)
}
} }
func (i *gatewayHandler) postHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) { func (i *gatewayHandler) postHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) {