Ticket #10793: 10793.diff

django/contrib/sitemaps/__init__.py

@@ -60 +60 @@
         return obj.get_absolute_url()
 
     def _get_paginator(self):
-        if not hasattr(self, "_paginator"):
-            self._paginator = paginator.Paginator(self.items(), self.limit)
-        return self._paginator
+        return paginator.Paginator(self.items(), self.limit)
     paginator = property(_get_paginator)
 
     def get_urls(self, page=1, site=None, protocol=None):

docs/releases/1.4.txt

@@ -1142 +1142 @@
 This attribute was confusingly named ``HttpRequest.raw_post_data``, but it
 actually provided the body of the HTTP request. It's been renamed to
 ``HttpRequest.body``, and ``HttpRequest.raw_post_data`` has been deprecated.
+
+``django.contrib.sitemaps`` bugfix with potential performance implications
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Issue #10793 was caused by excessive caching of Paginator objects and resulted
+in stale sitemap indexes being generated. Removing this cache causes new
+Paginator objects to be created and the :attr:`django.contrib.sitemaps.Sitemap.items()` method of the
+:class:`django.contrib.sitemaps.Sitemap` subclass to be called during every
+sitemap-related request.
+
+If the :attr:`django.contrib.sitemaps.Sitemap.items()` method returns a ``QuerySet``, its length will be evaluated
+which may lead to extra database queries. Consider using the cache framework
+to mitigate the performance impact.
+ No newline at end of file