summaryrefslogtreecommitdiff
path: root/django/middleware
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-04-09 23:54:34 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-04-09 23:54:34 +0000
commitbc4638d722c0e48cfd6bc4d8084b41445f987004 (patch)
tree3fa74811a9275d242c8f4808571abd95fe801e74 /django/middleware
parentb0a60c186ee2a5564b5fa897b994e4ff2b7ad5b2 (diff)
Fixed #1569 -- HttpResponse now accepts iterators. Thanks, Maniac
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/middleware')
-rw-r--r--django/middleware/common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/middleware/common.py b/django/middleware/common.py
index aa8f4ec071..3643fce553 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -67,7 +67,7 @@ class CommonMiddleware:
# Use ETags, if requested.
if settings.USE_ETAGS:
- etag = md5.new(response.get_content_as_string(settings.DEFAULT_CHARSET)).hexdigest()
+ etag = md5.new(response.content).hexdigest()
if request.META.get('HTTP_IF_NONE_MATCH') == etag:
response = httpwrappers.HttpResponseNotModified()
else: