Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #5013 -- Corrected the documentation about which how further mi…

…ddleware

processing is done after request or view middleware returns something. Thanks,
Jason Yan.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d79c6a0125a6d37d5aea63e6ef1d7821d2cf206c 1 parent 4c35865
Malcolm Tredinnick authored October 21, 2007
1  AUTHORS
@@ -329,6 +329,7 @@ answer newbie questions, and generally made Django that much better:
329 329
     Jakub Wiśniowski <restless.being@gmail.com>
330 330
     Maciej Wiśniowski <pigletto@gmail.com>
331 331
     wojtek
  332
+    Jason Yan <tailofthesun@gmail.com>
332 333
     ye7cakf02@sneakemail.com
333 334
     ymasuda@ethercube.com
334 335
     Jarek Zgoda <jarek.zgoda@gmail.com>
13  docs/middleware.txt
@@ -178,8 +178,9 @@ request, before Django decides which view to execute.
178 178
 ``process_request()`` should return either ``None`` or an ``HttpResponse``
179 179
 object. If it returns ``None``, Django will continue processing this request,
180 180
 executing any other middleware and, then, the appropriate view. If it returns
181  
-an ``HttpResponse`` object, Django won't bother calling ANY other middleware or
182  
-the appropriate view; it'll return that ``HttpResponse``.
  181
+an ``HttpResponse`` object, Django won't bother calling ANY other request,
  182
+view or exception middleware, or the appropriate view; it'll return that
  183
+``HttpResponse``. Response middleware is always called on every response.
183 184
 
184 185
 process_view
185 186
 ------------
@@ -197,8 +198,9 @@ arguments that will be passed to the view. Neither ``view_args`` nor
197 198
 return either ``None`` or an ``HttpResponse`` object. If it returns ``None``,
198 199
 Django will continue processing this request, executing any other
199 200
 ``process_view()`` middleware and, then, the appropriate view. If it returns an
200  
-``HttpResponse`` object, Django won't bother calling ANY other middleware or
201  
-the appropriate view; it'll return that ``HttpResponse``.
  201
+``HttpResponse`` object, Django won't bother calling ANY other request, view
  202
+or exception middleware, or the appropriate view; it'll return that
  203
+``HttpResponse``. Response middleware is always called on every response.
202 204
 
203 205
 process_response
204 206
 ----------------
@@ -236,7 +238,8 @@ Guidelines
236 238
 
237 239
     * Feel free to look at Django's available middleware for examples. The
238 240
       core Django middleware classes are in ``django/middleware/`` in the
239  
-      Django distribution. The session middleware is in ``django/contrib/sessions``.
  241
+      Django distribution. The session middleware is in
  242
+      ``django/contrib/sessions``.
240 243
 
241 244
     * If you write a middleware component that you think would be useful to
242 245
       other people, contribute to the community! Let us know, and we'll

0 notes on commit d79c6a0

Please sign in to comment.
Something went wrong with that request. Please try again.