gateway: apply review to serveFile
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Oct 20, 2017 at 13:36 UTC
cbccd847aba20203da8fc3232712ce150936f38c
1 file changed
+2
-9
core/corehttp/gateway_handler.go
+2
-9
@@ -268,7 +268,7 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
268
269
if !dir {
270
name := gopath.Base(urlPath)
271
- i.serverFile(w, r, name, modtime, dr)
271
+ i.serveFile(w, r, name, modtime, dr)
272
return
273
}
274
@@ -390,7 +390,7 @@ func (s *sizeSeeker) Seek(offset int64, whence int) (int64, error) {
390
return s.sizeReadSeeker.Seek(offset, whence)
391
}
392
393
-func (i *gatewayHandler) serverFile(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
393
+func (i *gatewayHandler) serveFile(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
394
if sp, ok := content.(sizeReadSeeker); ok {
395
content = &sizeSeeker{
396
sizeReadSeeker: sp,
@@ -398,13 +398,6 @@ func (i *gatewayHandler) serverFile(w http.ResponseWriter, req *http.Request, na
398
}
399
400
http.ServeContent(w, req, name, modtime, content)
401
- //TODO: check for errors in ServeContent.. somehow
402
-
403
- // If http.ServeContent can't figure out content size it won't write it to the
404
- // responseWriter, Content-Length not being set is a good indicator of this
405
- if req.Method != "HEAD" && w.Header().Get("Content-Length") == "" {
406
- io.Copy(w, content)
407
- }
401
}
402
403
func (i *gatewayHandler) postHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) {