Commit 02bbd9a9 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #7228 -- Fixed our ETag header creation to meet the HTTP spec, by... 

Fixed #7228 -- Fixed our ETag header creation to meet the HTTP spec, by quoting it. Thanks, skjohn@us.ibm.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 4094d03e

django/middleware/common.py

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ class CommonMiddleware(object): 
            if response.has_header('ETag'):

                etag = response['ETag']

            else:

                etag = md5.new(response.content).hexdigest()

                etag = '"%s"' % md5.new(response.content).hexdigest()

            if response.status_code >= 200 and response.status_code < 300 and request.META.get('HTTP_IF_NONE_MATCH') == etag:

                cookies = response.cookies

                response = http.HttpResponseNotModified()

django/utils/cache.py

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ def patch_response_headers(response, cache_timeout=None): 
    if cache_timeout < 0:

        cache_timeout = 0 # Can't have max-age negative

    if not response.has_header('ETag'):

        response['ETag'] = md5.new(response.content).hexdigest()

        response['ETag'] = '"%s"' % md5.new(response.content).hexdigest()

    if not response.has_header('Last-Modified'):

        response['Last-Modified'] = http_date()

    if not response.has_header('Expires'):