summaryrefslogtreecommitdiff
path: root/django/middleware
diff options
context:
space:
mode:
authorAlex Hayward <alex.hayward@telespazio.com>2021-05-19 12:19:23 +0100
committerCarlton Gibson <carlton@noumenal.es>2021-09-01 14:02:37 +0200
commiteeed488a3439c5c5c3f0b5991ee400851057e127 (patch)
tree4804090d847a3a5152ff6bcbe26089d22b6ecfcb /django/middleware
parent84c7c4a477eae5de394d036d7ba1e58a37e18b69 (diff)
Fixed #32768 -- Added Vary header when redirecting to prefixed i18n pattern.
get_language_from_request() uses Accept-Language and/or Cookie to determine the correct redirect. Upstream caches need the matching Vary header to cache the result.
Diffstat (limited to 'django/middleware')
-rw-r--r--django/middleware/locale.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/middleware/locale.py b/django/middleware/locale.py
index 0bbdda3309..d90fc84152 100644
--- a/django/middleware/locale.py
+++ b/django/middleware/locale.py
@@ -53,7 +53,12 @@ class LocaleMiddleware(MiddlewareMixin):
'%s%s/' % (script_prefix, language),
1
)
- return self.response_redirect_class(language_url)
+ # Redirect to the language-specific URL as detected by
+ # get_language_from_request(). HTTP caches may cache this
+ # redirect, so add the Vary header.
+ redirect = self.response_redirect_class(language_url)
+ patch_vary_headers(redirect, ('Accept-Language', 'Cookie'))
+ return redirect
if not (i18n_patterns_used and language_from_path):
patch_vary_headers(response, ('Accept-Language',))