Ticket #4992: cache_by_request_full_path.diff

django/utils/cache.py

@@ -144 +144 @@
         if value is not None:
             ctx.update(value)
     return 'views.decorators.cache.cache_page.%s.%s.%s' % (
-               key_prefix, iri_to_uri(request.path), ctx.hexdigest())
+               key_prefix, iri_to_uri(request.get_full_path()), ctx.hexdigest())
 
 def get_cache_key(request, key_prefix=None):
     """
-    Returns a cache key based on the request path. It can be used in the
+    Returns a cache key based on the request path and query. It can be used in the
     request phase because it pulls the list of headers to take into account
     from the global path registry and uses those to build a cache key to check
     against.
@@ -159 +159 @@
     if key_prefix is None:
         key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
-                    key_prefix, iri_to_uri(request.path))
+                    key_prefix, iri_to_uri(request.get_full_path()))
     headerlist = cache.get(cache_key, None)
     if headerlist is not None:
         return _generate_cache_key(request, headerlist, key_prefix)
@@ -184 +184 @@
     if cache_timeout is None:
         cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
-                    key_prefix, iri_to_uri(request.path))
+                    key_prefix, iri_to_uri(request.get_full_path()))
     if response.has_header('Vary'):
         headerlist = ['HTTP_'+header.upper().replace('-', '_')
                       for header in cc_delim_re.split(response['Vary'])]
@@ -192 +192 @@
         return _generate_cache_key(request, headerlist, key_prefix)
     else:
         # if there is no Vary header, we still need a cache key
-        # for the request.path
+        # for the request.get_full_path()
         cache.set(cache_key, [], cache_timeout)
         return _generate_cache_key(request, [], key_prefix)
 

django/middleware/cache.py

@@ -23 +23 @@
 
 More details about how the caching works:
 
-* Only parameter-less GET or HEAD-requests with status code 200 are cached.
+* Only GET or HEAD-requests with status code 200 are cached.
 
 * The number of seconds each page is stored for is set by the "max-age" section
   of the response's "Cache-Control" header, falling back to the
@@ -115 +115 @@
         if self.cache_anonymous_only:
             assert hasattr(request, 'user'), "The Django cache middleware with CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True requires authentication middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.auth.middleware.AuthenticationMiddleware' before the CacheMiddleware."
 
-        if not request.method in ('GET', 'HEAD') or request.GET:
+        if not request.method in ('GET', 'HEAD'):
             request._cache_update_cache = False
             return None # Don't bother checking the cache.
 

docs/topics/cache.txt

@@ -487 +487 @@
 said to "vary on language."
 
 By default, Django's cache system creates its cache keys using the requested
-path -- e.g., ``"/stories/2005/jun/23/bank_robbed/"``. This means every request
-to that URL will use the same cached version, regardless of user-agent
+path and query -- e.g., ``"/stories/2005/?order_by=author"``. This means every 
+request to that URL will use the same cached version, regardless of user-agent
 differences such as cookies or language preferences.
 
 That's where ``Vary`` comes in.