Ticket #17092: add_host_to_location.4.diff

django/http/response.py

@@ -98 +98 @@
     status_code = 200
     reason_phrase = None        # Use default reason phrase for status code.
 
-    def __init__(self, content_type=None, status=None, reason=None):
+    def __init__(self, content_type=None, status=None, reason=None, add_host_to_location=True):
         # _headers is a mapping of the lower-case name to the original case of
         # the header (required for working with legacy systems) and the header
         # value. Both the name of the header and its value are ASCII strings.
@@ -120 +120 @@
             self.reason_phrase = REASON_PHRASES.get(self.status_code,
                                                     'UNKNOWN STATUS CODE')
         self['Content-Type'] = content_type
+        self.add_host_to_location = add_host_to_location
 
     def serialize_headers(self):
         """HTTP headers as a bytestring."""

django/http/utils.py

@@ -17 +17 @@
     Code constructing response objects is free to insert relative paths, as
     this function converts them to absolute paths.
     """
-    if 'Location' in response and request.get_host():
+    if 'Location' in response and response.add_host_to_location and request.get_host():
         response['Location'] = request.build_absolute_uri(response['Location'])
     return response
 

docs/ref/request-response.txt

@@ -635 +635 @@
     This attribute exists so middleware can treat streaming responses
     differently from regular responses.
 
+.. versionadded:: 1.7
+.. attribute:::: HttpResponse.add_host_to_location
+
+    By default django ensures that all location headers contain an absolute
+    URI using request.build_absolute_uri to build it. If you
+    need to disable this behavior set ``add_host_to_location`` to False.
+
+
 Methods
 -------
 

tests/requests/tests.py

@@ -17 +17 @@
 from django.utils.http import cookie_date, urlencode
 from django.utils.six.moves.urllib.parse import urlencode as original_urlencode
 from django.utils.timezone import utc
-
+from django.http.utils import fix_location_header
 
 class RequestsTests(SimpleTestCase):
     def test_httprequest(self):
@@ -761 +761 @@
             request.build_absolute_uri(location='/foo/bar/'),
             'http://testserver/foo/bar/'
         )
+
+class FixHeaderTests(SimpleTestCase):
+    def test_httprequest_add_host(self):
+        request = HttpRequest()
+        request.META = {
+                u'HTTP_HOST': u'example.com',
+            }
+        response = HttpResponse()
+        response['Location'] = '/test'
+        response = fix_location_header(request, response)
+        self.assertEqual(response['Location'], 'http://example.com/test')
+
+    def test_httprequest_no_host(self):
+        request = HttpRequest()
+        response = HttpResponse(add_host_to_location=False)
+        response['Location'] = '/test'
+        response = fix_location_header(request, response)
+        self.assertEqual(response['Location'], '/test')