Merge pull request #183 from sk1p/fix_no_store

Fix behaviour of Cache-Control: no-store on responses

Author: ionrock

cachecontrol/controller.py

@@ -290,6 +290,8 @@ def cache_response(self, request, response, body=None,
         if no_store and self.cache.get(cache_url):
             logger.debug('Purging existing cache entry to honor "no-store"')
             self.cache.delete(cache_url)
+        if no_store:
+            return
 
         # If we've been given an etag, then keep the response
         if self.cache_etags and 'etag' in response_headers:

tests/test_cache_control.py

@@ -115,6 +115,12 @@ def test_cache_response_no_store(self):
         cc.cache_response(self.req(), resp)
         assert not cc.cache.get(cache_url)
 
+    def test_cache_response_no_store_with_etag(self, cc):
+        resp = self.resp({'cache-control': 'no-store', 'ETag': 'jfd9094r808'})
+        cc.cache_response(self.req(), resp)
+
+        assert not cc.cache.set.called
+
     def test_update_cached_response_with_valid_headers(self):
         cached_resp = Mock(headers={'ETag': 'jfd9094r808', 'Content-Length': 100})