diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py index 4f9fb2637e..18edc34f6a 100644 --- a/django/middleware/csrf.py +++ b/django/middleware/csrf.py @@ -229,7 +229,7 @@ class CsrfViewMiddleware(MiddlewareMixin): request.META['CSRF_COOKIE_NEEDS_UPDATE'] = True return csrf_token - def _set_token(self, request, response): + def _set_csrf_cookie(self, request, response): if settings.CSRF_USE_SESSIONS: if request.session.get(CSRF_SESSION_KEY) != request.META['CSRF_COOKIE']: request.session[CSRF_SESSION_KEY] = request.META['CSRF_COOKIE'] @@ -441,14 +441,14 @@ class CsrfViewMiddleware(MiddlewareMixin): def process_response(self, request, response): if request.META.get('CSRF_COOKIE_NEEDS_UPDATE'): - self._set_token(request, response) - # Unset the flag to prevent _set_token() from being unnecessarily - # called again in process_response() by other instances of - # CsrfViewMiddleware. This can happen e.g. when both a decorator and - # middleware are used. However, CSRF_COOKIE_NEEDS_UPDATE is still - # respected in subsequent calls e.g. in case rotate_token() is - # called in process_response() later by custom middleware but before - # those subsequent calls. + self._set_csrf_cookie(request, response) + # Unset the flag to prevent _set_csrf_cookie() from being + # unnecessarily called again in process_response() by other + # instances of CsrfViewMiddleware. This can happen e.g. when both a + # decorator and middleware are used. However, + # CSRF_COOKIE_NEEDS_UPDATE is still respected in subsequent calls + # e.g. in case rotate_token() is called in process_response() later + # by custom middleware but before those subsequent calls. request.META['CSRF_COOKIE_NEEDS_UPDATE'] = False return response