Fixed #20793 -- Added Last-Modified header to sitemaps.

2 files changed, 15 insertions, 0 deletions

diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 4467ed3a6e..7b53fc8c12 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -178,6 +178,15 @@ Sitemap class reference
         representing the last-modified date/time for *every* object returned by
         :attr:`~Sitemap.items()`.
 
+        .. versionadded:: 1.7
+
+        If all items in a sitemap have a :attr:`~Sitemap.lastmod`, the sitemap
+        generated by :func:`views.sitemap` will have a ``Last-Modified``
+        header equal to the latest ``lastmod``. You can activate the
+        :class:`~django.middleware.http.ConditionalGetMiddleware` to make
+        Django respond appropriately to requests with an ``If-Modified-Since``
+        header which will prevent sending the sitemap if it hasn't changed.
+
     .. attribute:: Sitemap.changefreq
 
         **Optional.** Either a method or attribute.
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index f0efe4f559..0951cd3058 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -95,6 +95,12 @@ Minor features
 * The :djadminopt:`--no-color` option for ``django-admin.py`` allows you to
   disable the colorization of management command output.
 
+* The :mod:`sitemap framework<django.contrib.sitemaps>` now makes use of
+  :attr:`~django.contrib.sitemaps.Sitemap.lastmod` to set a ``Last-Modified``
+  header in the response. This makes it possible for the
+  :class:`~django.middleware.http.ConditionalGetMiddleware` to handle
+  conditional ``GET`` requests for sitemaps which set ``lastmod``.
+
 Backwards incompatible changes in 1.7
 =====================================