summaryrefslogtreecommitdiff
path: root/docs/ref/request-response.txt
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2011-12-07 19:42:50 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2011-12-07 19:42:50 +0000
commit0519adb2a87090bd9ee3f61c7b9a6ff6de5fa341 (patch)
tree4da547886986f0d59b8fa7746a20b20d9b9f00c2 /docs/ref/request-response.txt
parent2693aa890ea6c8273dcdaeab6101203f37ffb1f3 (diff)
Clarified which setting causes HttpRequest.get_host() to rely on the HTTP_X_FORWARDED_HOST header.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/request-response.txt')
-rw-r--r--docs/ref/request-response.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index 228b69ebe2..64d0e10ca3 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -193,10 +193,10 @@ Methods
.. method:: HttpRequest.get_host()
- Returns the originating host of the request using information from
- the ``HTTP_X_FORWARDED_HOST`` (if enabled in the settings) and ``HTTP_HOST``
- headers (in that order). If they don't provide a value, the method
- uses a combination of ``SERVER_NAME`` and ``SERVER_PORT`` as
+ Returns the originating host of the request using information from the
+ ``HTTP_X_FORWARDED_HOST`` (if :setting:`USE_X_FORWARDED_HOST` is enabled)
+ and ``HTTP_HOST`` headers, in that order. If they don't provide a value,
+ the method uses a combination of ``SERVER_NAME`` and ``SERVER_PORT`` as
detailed in :pep:`3333`.
Example: ``"127.0.0.1:8000"``