Fixed the breakage in [6164] in a different, better way: HttpResponse now implements __contains__ along with __get/set/delitem__, as it should. This is a bit more robust, and should prevent similar breakage from user code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
5a5d8a90b5
commit
4100eab823
|
@ -142,7 +142,7 @@ def fix_location_header(request, response):
|
||||||
Code constructing response objects is free to insert relative paths and
|
Code constructing response objects is free to insert relative paths and
|
||||||
this function converts them to absolute paths.
|
this function converts them to absolute paths.
|
||||||
"""
|
"""
|
||||||
if 'location' in response.headers and http.get_host(request):
|
if 'Location' in response and http.get_host(request):
|
||||||
response['Location'] = request.build_absolute_uri(response['Location'])
|
response['Location'] = request.build_absolute_uri(response['Location'])
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
|
@ -273,6 +273,8 @@ class HttpResponse(object):
|
||||||
"Case-insensitive check for a header"
|
"Case-insensitive check for a header"
|
||||||
return self.headers.has_key(header.lower())
|
return self.headers.has_key(header.lower())
|
||||||
|
|
||||||
|
__contains__ = has_header
|
||||||
|
|
||||||
def set_cookie(self, key, value='', max_age=None, expires=None, path='/', domain=None, secure=None):
|
def set_cookie(self, key, value='', max_age=None, expires=None, path='/', domain=None, secure=None):
|
||||||
self.cookies[key] = value
|
self.cookies[key] = value
|
||||||
for var in ('max_age', 'path', 'domain', 'secure', 'expires'):
|
for var in ('max_age', 'path', 'domain', 'secure', 'expires'):
|
||||||
|
|
Loading…
Reference in New Issue