Ticket #10016: 10016-cache-middleware-handle-long-urls.diff

django/utils/cache.py

@@ -143 +143 @@
         value = request.META.get(header, None)
         if value is not None:
             ctx.update(value)
+    path = md5_constructor()
+    path.update(iri_to_uri(request.path))
     return 'views.decorators.cache.cache_page.%s.%s.%s' % (
-               key_prefix, iri_to_uri(request.path), ctx.hexdigest())
+               key_prefix, path.hexdigest(), ctx.hexdigest())
 
 def get_cache_key(request, key_prefix=None):
     """
@@ -158 +160 @@
     """
     if key_prefix is None:
         key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
+    path = md5_constructor()
+    path.update(iri_to_uri(request.path))
     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
-                    key_prefix, iri_to_uri(request.path))
+                    key_prefix, path.hexdigest())
     headerlist = cache.get(cache_key, None)
     if headerlist is not None:
         return _generate_cache_key(request, headerlist, key_prefix)
@@ -183 +187 @@
         key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
     if cache_timeout is None:
         cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
+    path = md5_constructor()
+    path.update(iri_to_uri(request.path))
     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
-                    key_prefix, iri_to_uri(request.path))
+                    key_prefix, path.hexdigest())
     if response.has_header('Vary'):
         headerlist = ['HTTP_'+header.upper().replace('-', '_')
                       for header in cc_delim_re.split(response['Vary'])]