From 570e8936d9aaf217ef61d9b46fb9f5361f013c28 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sat, 20 Oct 2007 06:50:16 +0000 Subject: [PATCH] Fixed #4969 -- Changed content retrieval in HttpResponse to be more robust in the presence of an existing content encoding. Fixes some sporadic failures with the GzipMiddleware, for example. Thanks, Johann Queuniet. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6548 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/http/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django/http/__init__.py b/django/http/__init__.py index 6fe6d0d760..6d13973097 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -317,8 +317,9 @@ class HttpResponse(object): self.cookies[key]['max-age'] = 0 def _get_content(self): - content = smart_str(''.join(self._container), self._charset) - return content + if self.has_header('Content-Encoding'): + return ''.join(self._container) + return smart_str(''.join(self._container), self._charset) def _set_content(self, value): self._container = [value]