Ticket #9356: csrf_fix.diff

django/contrib/csrf/middleware.py

@@ -63 +63 @@
 
     def process_response(self, request, response):
         csrf_token = None
-        try:
-            cookie = response.cookies[settings.SESSION_COOKIE_NAME]
-            csrf_token = _make_token(cookie.value)
-        except KeyError:
-            # No outgoing cookie to set session, but
-            # a session might already exist.
-            try:
-                session_id = request.COOKIES[settings.SESSION_COOKIE_NAME]
-                csrf_token = _make_token(session_id)
-            except KeyError:
-                # no incoming or outgoing cookie
-                pass
+        if hasattr(request, 'session'):
+            csrf_token = _make_token(request.session.session_key)
 
         if csrf_token is not None and \
                 response['Content-Type'].split(';')[0] in _HTML_TYPES: