Base, WebSection, Sound, OOoDocumentExtensibleTraversableMixin: set...

Base, WebSection, Sound, OOoDocumentExtensibleTraversableMixin: set Cache-Control header in 304 Not Modified response case as well.

bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.OOoDocumentExtensibleTraversableMixin.py

@@ -51,12 +51,12 @@ class OOoDocumentExtensibleTraversableMixin(BaseExtensibleTraversableMixin):
     try:
       self._convert(format='html')
       view = _ViewEmulator().__of__(self)
+      # call caching policy manager.
+      _setCacheHeaders(view, web_cache_kw)
       # If we have a conditional get, set status 304 and return
       # no content
       if _checkConditionalGET(view, web_cache_kw):
         return ''
-      # call caching policy manager.
-      _setCacheHeaders(view, web_cache_kw)
       mime, data = self.getConversion(format=EMBEDDED_FORMAT, filename=name)
       document = OFSFile(name, name, data, content_type=mime).__of__(self.aq_parent)
     except (NotConvertedError, ConversionError, KeyError):

bt5/erp5_multimedia/DocumentTemplateItem/portal_components/document.erp5.Sound.py

@@ -55,12 +55,12 @@ class Sound(File):
     if format:
       web_cache_kw['format'] = format
     view = _ViewEmulator().__of__(self)
+    # call caching policy manager.
+    _setCacheHeaders(view, web_cache_kw)
     # If we have a conditional get, set status 304 and return
     # no content
     if _checkConditionalGET(view, web_cache_kw):
       return ''
-    # call caching policy manager.
-    _setCacheHeaders(view, web_cache_kw)
 
     if not self.checkConversionFormatPermission(format, **kw):
       raise Forbidden('You are not allowed to get this document in this ' \

bt5/erp5_web/DocumentTemplateItem/portal_components/document.erp5.WebSection.py

@@ -257,12 +257,12 @@ class WebSection(Domain, DocumentExtensibleTraversableMixin):
           document = self
         result = getattr(document, custom_render_method_id)()
         view = _ViewEmulator().__of__(self)
+        # call caching policy manager.
+        _setCacheHeaders(view, {})
         # If we have a conditional get, set status 304 and return
         # no content
         if _checkConditionalGET(view, extra_context={}):
           return ''
-        # call caching policy manager.
-        _setCacheHeaders(view, {})
         return result
       elif document is not None:
         return document()

bt5/erp5_web/TestTemplateItem/portal_components/test.erp5.testERP5Web.py

@@ -29,6 +29,7 @@
 ##############################################################################
 
 import re
+import requests
 import time
 from unittest import expectedFailure, skip
 from StringIO import StringIO
@@ -1308,6 +1309,12 @@ Hé Hé Hé!""", page.asText().strip())
     self.assertTrue(self.publish(web_section.absolute_url_path()).getHeader('X-Cache-Headers-Set-By'))
     web_section.setCustomRenderMethodId('WebSection_viewAsWeb')
     self.assertTrue(self.publish(web_section.absolute_url_path()).getHeader('X-Cache-Headers-Set-By'))
+    conditional_get_response = requests.get(
+      web_section.absolute_url(),
+      headers={'If-Modified-Since': DateTime().utcdatetime().strftime('%a, %d %b %Y %H:%M:%S UTC')},
+    )
+    self.assertEqual(conditional_get_response.status_code, 304)
+    self.assertIn('Cache-Control', conditional_get_response.headers)
 
   def test_16_404ErrorPageIsReturned(self):
     """

product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.DownloadableMixin.py

@@ -117,12 +117,12 @@ class DownloadableMixin:
     if format:
       web_cache_kw['format'] = format
     view = _ViewEmulator().__of__(self)
+    # call caching policy manager.
+    _setCacheHeaders(view, web_cache_kw)
     # If we have a conditional get, set status 304 and return
     # no content
     if _checkConditionalGET(view, web_cache_kw):
       return ''
-    # call caching policy manager.
-    _setCacheHeaders(view, web_cache_kw)
 
     if not self.checkConversionFormatPermission(format, **kw):
       raise Forbidden('You are not allowed to get this document in this ' \

product/ERP5Type/Base.py

@@ -2553,12 +2553,12 @@ class Base(
     """Returns the default view even if index_html is overridden"""
     result = self._renderDefaultView('view')
     view = _ViewEmulator().__of__(self)
+    # call caching policy manager.
+    _setCacheHeaders(view, {})
     # If we have a conditional get, set status 304 and return
     # no content
     if _checkConditionalGET(view, extra_context={}):
       return ''
-    # call caching policy manager.
-    _setCacheHeaders(view, {})
     return result
 
   # Default views - the default security in CMFCore