Merge pull request #652 from kaedroho/image-frontend-cache-fix

Use cache_control decorator instead of cache_page

wagtail/wagtailimages/tests.py

@@ -783,9 +783,6 @@ class TestFrontendServeView(TestCase):
         self.assertEqual(response['Cache-Control'].split('=')[0], 'max-age')
         self.assertTrue(int(response['Cache-Control'].split('=')[1]) > datetime.timedelta(days=30).seconds)
 
-        self.assertIn('Expires', response)
-        self.assertTrue(dateutil.parser.parse(response['Expires']) > timezone.now() + datetime.timedelta(days=30))
-
     def test_get_invalid_signature(self):
         """
         Test that an invalid signature returns a 403 response

wagtail/wagtailimages/views/frontend.py

@@ -1,13 +1,13 @@
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponse
 from django.core.exceptions import PermissionDenied
-from django.views.decorators.cache import cache_page
+from django.views.decorators.cache import cache_control
 
 from wagtail.wagtailimages.models import get_image_model, Filter
 from wagtail.wagtailimages.utils.crypto import verify_signature
 
 
-@cache_page(60 * 60 * 24 * 60) # Cache for 60 days
+@cache_control(max_age=60*60*24*60) # Cache for 60 days
 def serve(request, signature, image_id, filter_spec):
     image = get_object_or_404(get_image_model(), id=image_id)