Fixed #27346 -- Stopped setting the Content-Length header in ConditionalGetMiddleware.

2 files changed, 6 insertions, 6 deletions

diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 71e888e928..e118bf14ce 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -181,12 +181,10 @@ header, the middleware adds one if needed. If the response has a ``ETag`` or
 ``If-Modified-Since``, the response is replaced by an
 :class:`~django.http.HttpResponseNotModified`.
 
-Also sets ``Content-Length`` response-header.
-
 .. versionchanged:: 1.11
 
-    In older versions, the middleware set the ``Date`` header and didn't set
-    the ``ETag`` header.
+    In older versions, the middleware set the ``Content-Length`` and ``Date``
+    headers and didn't set the ``ETag`` header.
 
 Locale middleware
 -----------------
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 55fe3be7f6..f4781463a8 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -579,8 +579,10 @@ Miscellaneous
 * In the admin templates, ``<p class="help">`` is replaced with a ``<div>`` tag
   to allow including lists inside help text.
 
-* ``ConditionalGetMiddleware`` no longer sets the ``Date`` header as Web
-  servers set that header.
+* :class:`~django.middleware.http.ConditionalGetMiddleware` no longer sets the
+  ``Date`` header as Web servers set that header. It also no longer sets the
+  ``Content-Length`` header as this is now done by
+  :class:`~django.middleware.common.CommonMiddleware`.
 
 * :meth:`~django.apps.AppConfig.get_model` and
   :meth:`~django.apps.AppConfig.get_models` now raise