Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.9.x] Fixed #26037 -- Documented precedence of USE_X_FORWARDED_HOST/PORT settings.

Browse Source 
Backport of 5cda4677b3df1be971000ef27470d3efc308d3be from master
This commit is contained in:
Arnaud Limbourg 2016-04-02 13:20:20 +02:00 committed by Tim Graham
parent 13d1676498
commit 1920d4d5a8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/ref/settings.txt
View File

@ -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``