diff options
author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-07-29 18:40:19 -0400 |
---|---|---|
committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-07-29 18:40:19 -0400 |
commit | 52a355b27541597fc155dab5e4885207b12a0a7b (patch) | |
tree | 7d00edf4d9e39a6b7e4c838ca6f7cb07a4d9a51c /mediagoblin/meddleware/csrf.py | |
parent | f26c21cd5b7998c903fa67aaf164c07743fee651 (diff) | |
parent | 08cd10d84fd89df3f0cad3835ba8ab8b8000d4b2 (diff) | |
download | mediagoblin-52a355b27541597fc155dab5e4885207b12a0a7b.tar.lz mediagoblin-52a355b27541597fc155dab5e4885207b12a0a7b.tar.xz mediagoblin-52a355b27541597fc155dab5e4885207b12a0a7b.zip |
Merge branch 'ticket-679' into OPW-Moderation-Update
Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/db/migration_tools.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/user_pages/views.py
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.""" |