summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Kam <kenkam@gmail.com>2015-02-22 17:46:15 +0000
committerTim Graham <timograham@gmail.com>2015-02-23 09:23:49 -0500
commita752a2c951d1836a8f58452b499974ff3742ee16 (patch)
tree01d85cde6ce88e8206d7a305bad7ac71a79533aa
parent41d5ed480cd55a71b739e779ca11f24caaa2b302 (diff)
[1.8.x] Fixed #23762 -- clarified CACHE_MIDDLEWARE_ANONYMOUS_ONLY deprecation in docs
Backport of e83aba0e2cce16cd1b32d1c172239a4e20867e95 from master
-rw-r--r--docs/releases/1.6.txt9
-rw-r--r--docs/releases/1.8.txt5
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 538394b2a3..737b5a2abc 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -1042,10 +1042,11 @@ If necessary, you can temporarily disable auto-escaping with
``CACHE_MIDDLEWARE_ANONYMOUS_ONLY`` setting
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-``CacheMiddleware`` used to provide a way to cache requests only if they
-weren't made by a logged-in user. This mechanism was largely ineffective
-because the middleware correctly takes into account the ``Vary: Cookie`` HTTP
-header, and this header is being set on a variety of occasions, such as:
+``CacheMiddleware`` and ``UpdateCacheMiddleware`` used to provide a way to
+cache requests only if they weren't made by a logged-in user. This mechanism
+was largely ineffective because the middleware correctly takes into account the
+``Vary: Cookie`` HTTP header, and this header is being set on a variety of
+occasions, such as:
* accessing the session, or
* using CSRF protection, which is turned on by default, or
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 26b9a72d23..7996a5c01c 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -1722,7 +1722,10 @@ removed in Django 1.8 (please see the :ref:`deprecation timeline
* The module ``django.test._doctest`` is removed.
-* The ``CACHE_MIDDLEWARE_ANONYMOUS_ONLY`` setting is removed.
+* The ``CACHE_MIDDLEWARE_ANONYMOUS_ONLY`` setting is removed. This change
+ affects both ``django.middleware.cache.CacheMiddleware`` and
+ ``django.middleware.cache.UpdateCacheMiddleware`` despite the lack of a
+ deprecation warning in the latter class.
* Usage of the hard-coded *Hold down "Control", or "Command" on a Mac, to select
more than one.* string to override or append to user-provided ``help_text`` in