Author: mtredinnick
Date: 2007-10-21 07:24:37 -0500 (Sun, 21 Oct 2007)
New Revision: 6576
Modified:
django/trunk/AUTHORS
django/trunk/docs/middleware.txt
Log:
Fixed #5013 -- Corrected the documentation about which how further middleware
processing is done after request or view middleware returns something. Thanks,
Jason Yan.
Modified: django/trunk/AUTHORS
===================================================================
--- django/trunk/AUTHORS 2007-10-21 12:12:45 UTC (rev 6575)
+++ django/trunk/AUTHORS 2007-10-21 12:24:37 UTC (rev 6576)
@@ -329,6 +329,7 @@
Jakub Wiśniowski <[EMAIL PROTECTED]>
Maciej Wiśniowski <[EMAIL PROTECTED]>
wojtek
+ Jason Yan <[EMAIL PROTECTED]>
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Jarek Zgoda <[EMAIL PROTECTED]>
Modified: django/trunk/docs/middleware.txt
===================================================================
--- django/trunk/docs/middleware.txt 2007-10-21 12:12:45 UTC (rev 6575)
+++ django/trunk/docs/middleware.txt 2007-10-21 12:24:37 UTC (rev 6576)
@@ -178,8 +178,9 @@
``process_request()`` should return either ``None`` or an ``HttpResponse``
object. If it returns ``None``, Django will continue processing this request,
executing any other middleware and, then, the appropriate view. If it returns
-an ``HttpResponse`` object, Django won't bother calling ANY other middleware or
-the appropriate view; it'll return that ``HttpResponse``.
+an ``HttpResponse`` object, Django won't bother calling ANY other request,
+view or exception middleware, or the appropriate view; it'll return that
+``HttpResponse``. Response middleware is always called on every response.
process_view
------------
@@ -197,8 +198,9 @@
return either ``None`` or an ``HttpResponse`` object. If it returns ``None``,
Django will continue processing this request, executing any other
``process_view()`` middleware and, then, the appropriate view. If it returns an
-``HttpResponse`` object, Django won't bother calling ANY other middleware or
-the appropriate view; it'll return that ``HttpResponse``.
+``HttpResponse`` object, Django won't bother calling ANY other request, view
+or exception middleware, or the appropriate view; it'll return that
+``HttpResponse``. Response middleware is always called on every response.
process_response
----------------
@@ -236,7 +238,8 @@
* Feel free to look at Django's available middleware for examples. The
core Django middleware classes are in ``django/middleware/`` in the
- Django distribution. The session middleware is in
``django/contrib/sessions``.
+ Django distribution. The session middleware is in
+ ``django/contrib/sessions``.
* If you write a middleware component that you think would be useful to
other people, contribute to the community! Let us know, and we'll
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
