Commit fdde600f authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

[1.0.X] Fixed #10470 -- Fixed a race condition in middleware initialization. 

Thanks to Travis Terry and mrts.

Backport of r10036 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 75cc96bc

django/core/handlers/base.py

+6 −1
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ class BaseHandler(object): 
        """

        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('.')
@@ -57,6 +58,10 @@ class BaseHandler(object): 
            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