2 files changed, 32 insertions, 2 deletions
diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index dc213510..d4f456d7 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -47,7 +47,16 @@ class data_rest_Core {
       throw new Kohana_404_Exception();
     }
 
-    // We don't have a cache buster in the url, so don't set cache headers here.
+    header("Content-Length: " . filesize($file));
+
+    if (isset($p->m)) {
+      header("Pragma:");
+      // Check that the content hasn't expired or it wasn't changed since cached
+      expires::check(2592000, $item->updated);
+
+      expires::set(2592000, $item->updated);  // 30 days
+    }
+
     // We don't need to save the session for this request
     Session::instance()->abort_save();
 
@@ -84,6 +93,18 @@ class data_rest_Core {
   }
 
   static function url($item, $size) {
-    return url::abs_site("rest/data/{$item->id}?size=$size");
+    if ($size == "full") {
+      $file = $item->file_path();
+    } else if ($size == "resize") {
+      $file = $item->resize_path();
+    } else {
+      $file = $item->thumb_path();
+    }
+    if (!file_exists($file)) {
+      throw new Kohana_404_Exception();
+    }
+
+    return url::abs_site("rest/data/{$item->id}?size=$size&m=" . filemtime($file));
   }
 }
+
diff --git a/modules/gallery/tests/Data_Rest_Helper_Test.php b/modules/gallery/tests/Data_Rest_Helper_Test.php
index 69d17997..e6a94864 100644
--- a/modules/gallery/tests/Data_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Data_Rest_Helper_Test.php
@@ -99,4 +99,13 @@ class Data_Rest_Helper_Test extends Gallery_Unit_Test_Case {
       // pass
     }
   }
+
+  public function cache_buster_test() {
+    $photo = test::random_photo();
+
+    $this->assert_same(
+      url::abs_site("rest/data/{$photo->id}?size=thumb&m=" . filemtime($photo->thumb_path())),
+      data_rest::url($photo, "thumb"));
+  }
 }
+