diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/handlers/wsgi.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index d3632c77ed..2fd99921b8 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -242,10 +242,16 @@ class WSGIHandler(base.BaseHandler): # settings weren't available. if self._request_middleware is None: self.initLock.acquire() - # Check that middleware is still uninitialised. - if self._request_middleware is None: - self.load_middleware() - self.initLock.release() + try: + # Check that middleware is still uninitialised. + if self._request_middleware is None: + self.load_middleware() + except: + # Unload whatever middleware we got + self._request_middleware = None + raise + finally: + self.initLock.release() set_script_prefix(base.get_script_name(environ)) signals.request_started.send(sender=self.__class__) |