summaryrefslogtreecommitdiff
path: root/docs/settings.txt
diff options
context:
space:
mode:
authorChristopher Long <indirecthit@gmail.com>2006-08-14 18:52:03 +0000
committerChristopher Long <indirecthit@gmail.com>2006-08-14 18:52:03 +0000
commit4cfd3203a67cd6e1fccccab5c85da5551814d2ee (patch)
tree0b8ed10b392cdf17b218aab3a0856f2ba58160ad /docs/settings.txt
parent4f0118995c43fd3cb5f79ffcbaf10b1115d8e434 (diff)
[per-object-permissions] Merged to revision 3582
git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/settings.txt')
-rw-r--r--docs/settings.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index 099196e56e..67e0498e1a 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -647,6 +647,18 @@ Default: ``'sessionid'``
The name of the cookie to use for sessions. This can be whatever you want.
See the `session docs`_.
+SESSION_COOKIE_SECURE
+---------------------
+
+**New in Django development version**
+
+Default: ``False``
+
+Whether to use a secure cookie for the session cookie. If this is set to
+``True``, the cookie will be marked as "secure," which means browsers may
+ensure that the cookie is only sent under an HTTPS connection.
+See the `session docs`_.
+
SESSION_EXPIRE_AT_BROWSER_CLOSE
-------------------------------