Ticket #1509: anonymous_caching.patch

Users/mcroydon/django/django_src.trunk/django/middleware/cache.py

@@ -9 +9 @@
     cached for CACHE_MIDDLEWARE_SECONDS seconds. Cache is based on URLs.
 
     Only parameter-less GET or HEAD-requests with status code 200 are cached.
+    
+    If CACHE_MIDDLEWARE_ANONYMOUS_ONLY is set to True, only anonymous requests
+    (those not made by a logged in user) are cached.
 
     This middleware expects that a HEAD request is answered with a response
     exactly like the corresponding GET request.
@@ -23 +26 @@
     This middleware also sets ETag, Last-Modified, Expires and Cache-Control
     headers on the response object.
     """
-    def __init__(self, cache_timeout=None, key_prefix=None):
+    def __init__(self, cache_timeout=None, key_prefix=None, cache_anonymous=None):
         self.cache_timeout = cache_timeout
         if cache_timeout is None:
             self.cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
         self.key_prefix = key_prefix
         if key_prefix is None:
             self.key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
+        self.cache_anonymous = cache_anonymous
+        if cache_anonymous is None and hasattr(settings, "CACHE_MIDDLEWARE_ANONYMOUS_ONLY"):
+            self.cache_anonymous = settings.CACHE_MIDDLEWARE_ANONYMOUS_ONLY
 
     def process_request(self, request):
-        "Checks whether the page is already cached and returns the cached version if available."
+        "Checks whether the page is already cached and returns the cached version if available."             
         if not request.META['REQUEST_METHOD'] in ('GET', 'HEAD') or request.GET:
             request._cache_update_cache = False
             return None # Don't bother checking the cache.
+            
+        if self.cache_anonymous and not request.user.is_anonymous():
+            request._cache_update_cache = False
+            return None # Don't cache logged in users
 
         cache_key = get_cache_key(request, self.key_prefix)
         if cache_key is None: