summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
authormlavin <markdlavin@gmail.com>2014-04-20 08:58:29 -0400
committerTim Graham <timograham@gmail.com>2014-06-13 12:40:42 -0400
commitd94de802d34c858805a01d3c699799aebc247ec3 (patch)
treee6a99c7b37a052a9ebb6820f59f251357a573c72 /django/conf
parentd3bf537324c1164dee45070f90d48661b27a781f (diff)
[1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults.
Also added a compatibility check for changed middleware defaults.
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/global_settings.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 94230d3ca5..38d836aff9 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -461,12 +461,7 @@ SECURE_PROXY_SSL_HEADER = None
# response phase the middleware will be applied in reverse order.
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- # 'django.middleware.http.ConditionalGetMiddleware',
- # 'django.middleware.gzip.GZipMiddleware',
)
############