diff options
| author | Tim Graham <timograham@gmail.com> | 2017-11-01 10:57:59 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-11-01 11:06:56 -0400 |
| commit | cd37e470962e544f60493d2a2c5f3a76c945a7e6 (patch) | |
| tree | f4e7428181c2d80be3a07c78fdd34f5cc8e9f08a /docs/ref | |
| parent | 2e6dd975a228d8a590248da38a2b6f4e74876260 (diff) | |
[2.0.x] Fixed #28741 -- Removed unnecessary leading dot from cross-domain cookie examples.
Backport of afd375fc343baa46e61036087bc43b3d096bb0ca from master
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/request-response.txt | 7 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index 9eafd1b10a..c7c6d450a3 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -754,10 +754,9 @@ Methods in UTC. If ``expires`` is a ``datetime`` object, the ``max_age`` will be calculated. * Use ``domain`` if you want to set a cross-domain cookie. For example, - ``domain=".lawrence.com"`` will set a cookie that is readable by - the domains www.lawrence.com, blogs.lawrence.com and - calendars.lawrence.com. Otherwise, a cookie will only be readable by - the domain that set it. + ``domain="example.com"`` will set a cookie that is readable by the + domains www.example.com, blog.example.com, etc. Otherwise, a cookie will + only be readable by the domain that set it. * Use ``httponly=True`` if you want to prevent client-side JavaScript from having access to the cookie. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 90e6d1fe7c..5c530b7a04 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -317,7 +317,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 @@ -1756,8 +1756,8 @@ The age of the language cookie, in seconds. Default: ``None`` The domain to use for the language cookie. Set this to a string such as -``".example.com"`` (note the leading dot!) for cross-domain cookies, or use -``None`` for a standard domain cookie. +``"example.com"`` for cross-domain cookies, or use ``None`` for a standard +domain cookie. Be cautious when updating this setting on a production site. If you update this setting to enable cross-domain cookies on a site that previously used @@ -3002,8 +3002,8 @@ The age of session cookies, in seconds. Default: ``None`` The domain to use for session cookies. Set this to a string such as -``".example.com"`` (note the leading dot!) for cross-domain cookies, or use -``None`` for a standard domain cookie. +``"example.com"`` for cross-domain cookies, or use ``None`` for a standard +domain cookie. Be cautious when updating this setting on a production site. If you update this setting to enable cross-domain cookies on a site that previously used |