Преглед изворни кода

Refs #26447 -- Removed outdated ETag comment in CommonMiddleware.

Follow up to 48d57788ee56811fa77cd37b9edf40535f82d87e.
Tim Graham пре 7 година
родитељ
комит
8f8a4d10d3
2 измењених фајлова са 8 додато и 7 уклоњено
  1. 0 2
      django/middleware/common.py
  2. 8 5
      docs/ref/middleware.txt

+ 0 - 2
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.
         """

+ 8 - 5
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``.