Issue 653: Handle the case where request.vary is None

diff --git a/mediagoblin/middleware/csrf.py b/mediagoblin/middleware/csrf.py
index 6c977f21a5e7c3a92988aa64ddcb2981eba4cf36..d0601af89e92ac26cea297aead7b6bcc7685734a 100644 (file)
--- a/mediagoblin/middleware/csrf.py
+++ b/mediagoblin/middleware/csrf.py
@@ -98,7 +98,7 @@ class CsrfMiddleware(object):
             httponly=True)
 
         # update the Vary header
-        response.vary = getattr(response, 'vary', []) + ['Cookie']
+        response.vary = (getattr(response, 'vary') or []) + ['Cookie']
 
     def _make_token(self, request):
         """Generate a new token to use for CSRF protection."""