summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-10-24 19:34:40 +0200
committerClaude Paroz <claude@2xlibre.net>2013-10-24 21:24:04 +0200
commitc052699be3637c22e3a26383a4bdabc8c3cc0feb (patch)
tree77de929d9eff2b5801397af16114d7c81dedcffb /docs
parent08c9ab5a0f564a3ac7803e6a97fae855f2e0524e (diff)
Fixed #20338 -- Stripped ending dot during host validation
Thanks manfre for the report and Timo Graham for the review.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt14
1 files changed, 9 insertions, 5 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 76e771bf34..32a8237d3f 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -79,18 +79,22 @@ responsible to provide your own validation of the ``Host`` header (perhaps in a
middleware; if so this middleware must be listed first in
:setting:`MIDDLEWARE_CLASSES`).
-.. note::
+.. versionchanged:: 1.7
- If you want to also allow the `fully qualified domain name (FQDN)`_, which
- some browsers can send in the Host header, you must explicitly add another
- ALLOWED_HOSTS entry that includes a trailing period. This entry can also be
- a subdomain wildcard::
+ In previous versions of Django, if you wanted to also allow the
+ `fully qualified domain name (FQDN)`_, which some browsers can send in the
+ ``Host`` header, you had to explicitly add another ``ALLOWED_HOSTS`` entry
+ that included a trailing period. This entry could also be a subdomain
+ wildcard::
ALLOWED_HOSTS = [
'.example.com', # Allow domain and subdomains
'.example.com.', # Also allow FQDN and subdomains
]
+ In Django 1.7, the trailing dot is stripped when performing host validation,
+ thus an entry with a trailing dot isn't required.
+
.. _`fully qualified domain name (FQDN)`: http://en.wikipedia.org/wiki/Fully_qualified_domain_name
If the ``Host`` header (or ``X-Forwarded-Host`` if