Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets

Jkarni/feature/middleware locked assets
2013-09-24 12:25:05 -07:00
parent 73e038834c 1a0b752a81
commit ad939b1e7c
9 changed files with 209 additions and 4 deletions
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -140,7 +140,6 @@ TEMPLATE_LOADERS = (
 )

 MIDDLEWARE_CLASSES = (
-    'contentserver.middleware.StaticContentServer',
    'request_cache.middleware.RequestCache',
    'django.middleware.cache.UpdateCacheMiddleware',
    'django.middleware.common.CommonMiddleware',
@@ -150,6 +149,7 @@ MIDDLEWARE_CLASSES = (

    # Instead of AuthenticationMiddleware, we use a cache-backed version
    'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
+    'contentserver.middleware.StaticContentServer',

    'django.contrib.messages.middleware.MessageMiddleware',
    'track.middleware.TrackMiddleware',