Skip to content

Commit

Permalink
Fixed #10470 -- Fixed a race condition in middleware initialization.
Browse files Browse the repository at this point in the history
Thanks to Travis Terry and mrts.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
malcolmt committed Mar 12, 2009
1 parent a152909 commit 6483fdf
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion django/core/handlers/base.py
Expand Up @@ -24,10 +24,11 @@ def load_middleware(self):
"""
from django.conf import settings
from django.core import exceptions
self._request_middleware = []
self._view_middleware = []
self._response_middleware = []
self._exception_middleware = []

request_middleware = []
for middleware_path in settings.MIDDLEWARE_CLASSES:
try:
dot = middleware_path.rindex('.')
Expand Down Expand Up @@ -57,6 +58,10 @@ def load_middleware(self):
if hasattr(mw_instance, 'process_exception'):
self._exception_middleware.insert(0, mw_instance.process_exception)

# We only assign to this when initialization is complete as it is used
# as a flag for initialization being complete.
self._request_middleware = request_middleware

def get_response(self, request):
"Returns an HttpResponse object for the given HttpRequest"
from django.core import exceptions, urlresolvers
Expand Down

0 comments on commit 6483fdf

Please sign in to comment.