summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCarlton Gibson <carlton.gibson@noumenal.es>2020-10-06 10:12:04 +0200
committerCarlton Gibson <carlton.gibson@noumenal.es>2020-10-07 10:04:24 +0200
commit1f8dbc8fa9f4c961a2b28fd03fd4892f379e929c (patch)
tree6980a74e020f61dce5996d9425ef7735db2bf223 /docs
parent3add635ff7b5dd3eb35d58f1120488d448fa286f (diff)
[3.1.x] Fixed #32065 -- Restored leading dot to CSRF_COOKIE_DOMAIN examples.
Partially reverts afd375fc343baa46e61036087bc43b3d096bb0ca. Thanks to Tim Graham for review. Backport of 3d4ffd1ff0eb9343ee41de77caf6ae427b6e873c from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/csrf.txt8
-rw-r--r--docs/ref/settings.txt2
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/csrf.txt b/docs/ref/csrf.txt
index 95e2e83d5c..175cbb7da0 100644
--- a/docs/ref/csrf.txt
+++ b/docs/ref/csrf.txt
@@ -276,10 +276,10 @@ The CSRF protection is based on the following things:
enough under HTTP.)
If the :setting:`CSRF_COOKIE_DOMAIN` setting is set, the referer is compared
- against it. This setting supports subdomains. For example,
- ``CSRF_COOKIE_DOMAIN = '.example.com'`` will allow POST requests from
- ``www.example.com`` and ``api.example.com``. If the setting is not set, then
- the referer must match the HTTP ``Host`` header.
+ against it. You can allow cross-subdomain requests by including a leading
+ dot. For example, ``CSRF_COOKIE_DOMAIN = '.example.com'`` will allow POST
+ requests from ``www.example.com`` and ``api.example.com``. If the setting is
+ not set, then the referer must match the HTTP ``Host`` header.
Expanding the accepted referers beyond the current host or cookie domain can
be done with the :setting:`CSRF_TRUSTED_ORIGINS` setting.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 0ad022874b..a02dcfcf68 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -313,7 +313,7 @@ Default: ``None``
The domain to be used when setting the CSRF cookie. This can be useful for
easily allowing cross-subdomain requests to be excluded from the normal cross
site request forgery protection. It should be set to a string such as
-``"example.com"`` to allow a POST request from a form on one subdomain to be
+``".example.com"`` to allow a POST request from a form on one subdomain to be
accepted by a view served from another subdomain.
Please note that the presence of this setting does not imply that Django's CSRF