diff options
author | Aditi <aditi.iitr@gmail.com> | 2013-07-04 21:35:22 +0530 |
---|---|---|
committer | Aditi <aditi.iitr@gmail.com> | 2013-07-04 21:35:22 +0530 |
commit | 7b77f7e490a27de57a4dab5301662ef95d11b213 (patch) | |
tree | 9b87d1720e64565e42970bcc24625ff6bfd8fa85 /mediagoblin/meddleware/csrf.py | |
parent | 2392fbc02bbf6d05d998de5091b8f11f37c101f0 (diff) | |
parent | 41a14c6efc1dd9cfc36f1b2eb4cb3f3b34e4d975 (diff) | |
download | mediagoblin-7b77f7e490a27de57a4dab5301662ef95d11b213.tar.lz mediagoblin-7b77f7e490a27de57a4dab5301662ef95d11b213.tar.xz mediagoblin-7b77f7e490a27de57a4dab5301662ef95d11b213.zip |
Merge remote-tracking branch 'cweb/master'
sage aborts
Merge branch master of git://gitorious.org/mediagoblin/mediagoblin.git
Diffstat (limited to 'mediagoblin/meddleware/csrf.py')
-rw-r--r-- | mediagoblin/meddleware/csrf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/meddleware/csrf.py b/mediagoblin/meddleware/csrf.py index 661f0ba2..44d42d75 100644 --- a/mediagoblin/meddleware/csrf.py +++ b/mediagoblin/meddleware/csrf.py @@ -111,7 +111,7 @@ class CsrfMeddleware(BaseMeddleware): httponly=True) # update the Vary header - response.vary = (getattr(response, 'vary', None) or []) + ['Cookie'] + response.vary = list(getattr(response, 'vary', None) or []) + ['Cookie'] def _make_token(self, request): """Generate a new token to use for CSRF protection.""" |