summaryrefslogtreecommitdiff
path: root/django/middleware
diff options
context:
space:
mode:
Diffstat (limited to 'django/middleware')
-rw-r--r--django/middleware/cache.py2
-rw-r--r--django/middleware/common.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/middleware/cache.py b/django/middleware/cache.py
index f3d03e657a..7f4057eec7 100644
--- a/django/middleware/cache.py
+++ b/django/middleware/cache.py
@@ -76,7 +76,7 @@ class CacheMiddleware:
Sets the cache, if needed.
"""
if request._cache_middleware_set_cache:
- content = response.get_content_as_string('utf-8')
+ content = response.get_content_as_string(settings.DEFAULT_CHARSET)
if request._cache_middleware_accepts_gzip:
content = compress_string(content)
response.content = content
diff --git a/django/middleware/common.py b/django/middleware/common.py
index 4abe4ee236..e794477b62 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -76,7 +76,7 @@ class CommonMiddleware:
# Use ETags, if requested.
if settings.USE_ETAGS:
- etag = md5.new(response.get_content_as_string('utf-8')).hexdigest()
+ etag = md5.new(response.get_content_as_string(settings.DEFAULT_CHARSET)).hexdigest()
if request.META.get('HTTP_IF_NONE_MATCH') == etag:
response = httpwrappers.HttpResponseNotModified()
else: