summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 4770bcea90..6044c4f7cf 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2679,10 +2679,14 @@ See also :setting:`TIME_ZONE`, :setting:`USE_I18N` and :setting:`USE_L10N`.
Default: ``False``
-A boolean that specifies whether to use the X-Forwarded-Host header in
-preference to the Host header. This should only be enabled if a proxy
+A boolean that specifies whether to use the ``X-Forwarded-Host`` header in
+preference to the ``Host`` header. This should only be enabled if a proxy
which sets this header is in use.
+This setting takes priority over :setting:`USE_X_FORWARDED_PORT`. Per
+:rfc:`7239#page-7`, the ``X-Forwarded-Host`` header can include the port
+number, in which case you shouldn't use :setting:`USE_X_FORWARDED_PORT`.
+
.. setting:: USE_X_FORWARDED_PORT
``USE_X_FORWARDED_PORT``
@@ -2692,10 +2696,12 @@ which sets this header is in use.
Default: ``False``
-A boolean that specifies whether to use the X-Forwarded-Port header in
+A boolean that specifies whether to use the ``X-Forwarded-Port`` header in
preference to the ``SERVER_PORT`` ``META`` variable. This should only be
enabled if a proxy which sets this header is in use.
+:setting:`USE_X_FORWARDED_HOST` takes priority over this setting.
+
.. setting:: WSGI_APPLICATION
``WSGI_APPLICATION``