Fixed #4969 -- Changed content retrieval in HttpResponse to be more r…

…obust 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

@@ -317,8 +317,9 @@ def delete_cookie(self, key, path='/', domain=None):
         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]