mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2007-10-20 06:50:16 +00:00
parent aa320700d2
commit 570e8936d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/http/__init__.py
View File

@ -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]