Issue 27: feature request - Last-Modified header

2 files changed, 22 insertions, 4 deletions

diff --git a/go/weed/volume.go b/go/weed/volume.go
index 6282b0bc8..039212793 100644
--- a/go/weed/volume.go
+++ b/go/weed/volume.go
@@ -145,6 +145,17 @@ func GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool)
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
+	if n.LastModified != 0 {
+		w.Header().Set("Last-Modified", time.Unix(int64(n.LastModified), 0).UTC().Format(http.TimeFormat))
+		if r.Header.Get("If-Modified-Since") != "" {
+			if t, parseError := time.Parse(http.TimeFormat, r.Header.Get("If-Modified-Since")); parseError == nil {
+				if t.Unix() <= int64(n.LastModified) {
+					w.WriteHeader(http.StatusNotModified)
+					return
+				}
+			}
+		}
+	}
 	if n.NameSize > 0 {
 		fname := string(n.Name)
 		dotIndex := strings.LastIndex(fname, ".")
@@ -165,10 +176,6 @@ func GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool)
 	if n.NameSize > 0 {
 		w.Header().Set("Content-Disposition", "filename="+fileNameEscaper.Replace(string(n.Name)))
 	}
-	if n.LastModified != 0 {
-		println("file time is", n.LastModified)
-		w.Header().Set("Last-Modified", time.Unix(int64(n.LastModified), 0).Format(http.TimeFormat))
-	}
 	if ext != ".gz" {
 		if n.IsGzipped() {
 			if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
diff --git a/go/weed/volume_test.go b/go/weed/volume_test.go
new file mode 100644
index 000000000..09340910b
--- /dev/null
+++ b/go/weed/volume_test.go
@@ -0,0 +1,11 @@
+package main
+
+import (
+	"net/http"
+	"testing"
+	"time"
+)
+
+func TestXYZ(t *testing.T) {
+	println("Last-Modified", time.Unix(int64(1373273596), 0).UTC().Format(http.TimeFormat))
+}