Merge branch 'release-v1.8.1-ecportal' of github.com:okfn/ckan into r…

…elease-v1.8.1-ecportal
ckan · Aug 22, 2013 · 4b53b74 · 4b53b74
2 parents d5a4679 + bde8980
commit 4b53b74
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
@@ -312,8 +312,8 @@ def __call__(self, environ, start_response):
             key = ''.join([
                 environ['HTTP_USER_AGENT'],
                 environ['REMOTE_ADDR'],
-                environ['HTTP_ACCEPT_LANGUAGE'],
-                environ['HTTP_ACCEPT_ENCODING'],
+                environ.get('HTTP_ACCEPT_LANGUAGE', ''),
+                environ.get('HTTP_ACCEPT_ENCODING', ''),
             ])
             key = hashlib.md5(key).hexdigest()
             # store key/data here