From 8f8a4d10d34c1fd6104b08efd16c5c377c142865 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 11 Nov 2017 20:45:17 -0500 Subject: [PATCH] Refs #26447 -- Removed outdated ETag comment in CommonMiddleware. Follow up to 48d57788ee56811fa77cd37b9edf40535f82d87e. --- django/middleware/common.py | 2 -- docs/ref/middleware.txt | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/django/middleware/common.py b/django/middleware/common.py index 7e520b70611..2a74774654a 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -94,8 +94,6 @@ class CommonMiddleware(MiddlewareMixin): def process_response(self, request, response): """ - Calculate the ETag, if needed. - When the status code of the response is 404, it may redirect to a path with an appended slash if should_redirect_with_slash() returns True. """ diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt index f4d5288ed78..cfa6a776650 100644 --- a/docs/ref/middleware.txt +++ b/docs/ref/middleware.txt @@ -456,6 +456,14 @@ Here are some hints about the ordering of various Django middleware classes: After ``UpdateCacheMiddleware``: Modifies ``Vary`` header. +#. :class:`~django.middleware.http.ConditionalGetMiddleware` + + Before any middleware that may change the response (it sets the ``ETag`` + header). + + After ``GZipMiddleware`` so it won't calculate an ``ETag`` header on gzipped + contents. + #. :class:`~django.middleware.locale.LocaleMiddleware` One of the topmost, after ``SessionMiddleware`` (uses session data) and @@ -463,11 +471,6 @@ Here are some hints about the ordering of various Django middleware classes: #. :class:`~django.middleware.common.CommonMiddleware` - Before any middleware that may change the response (it calculates ``ETags``). - - After ``GZipMiddleware`` so it won't calculate an ``ETag`` header on gzipped - contents. - Close to the top: it redirects when :setting:`APPEND_SLASH` or :setting:`PREPEND_WWW` are set to ``True``.