11221: Always restart systemd services, even after a few startup failures.

[arvados.git] / services / keep-web / handler.go

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 8dee88d485e40003b1c4f70d3f1cf86354a67a9e..db7517adc68ee39ec2300e7763caad7cd5ab07c3 100644 (file)
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -4,7 +4,6 @@ import (
        "fmt"
        "html"
        "io"
-       "mime"
        "net/http"
        "net/url"
        "os"
@@ -336,29 +335,15 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
        }
        defer rdr.Close()
 
-       basenamePos := strings.LastIndex(filename, "/")
-       if basenamePos < 0 {
-               basenamePos = 0
-       }
-       extPos := strings.LastIndex(filename, ".")
-       if extPos > basenamePos {
-               // Now extPos is safely >= 0.
-               if t := mime.TypeByExtension(filename[extPos:]); t != "" {
-                       w.Header().Set("Content-Type", t)
-               }
-       }
-       if rdr, ok := rdr.(keepclient.Reader); ok {
-               w.Header().Set("Content-Length", fmt.Sprintf("%d", rdr.Len()))
-       }
-
-       applyContentDispositionHdr(w, r, filename[basenamePos:], attachment)
+       basename := path.Base(filename)
+       applyContentDispositionHdr(w, r, basename, attachment)
 
        modstr, _ := collection["modified_at"].(string)
        modtime, err := time.Parse(time.RFC3339Nano, modstr)
        if err != nil {
                modtime = time.Now()
        }
-       http.ServeContent(w, r, path.Base(filename), modtime, rdr)
+       http.ServeContent(w, r, basename, modtime, rdr)
 }
 
 func applyContentDispositionHdr(w http.ResponseWriter, r *http.Request, filename string, isAttachment bool) {