summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-12-09 03:39:31 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-12-09 03:39:31 +0000
commite6745d34202d02bc48b2c9f133f389cf8a4cddb3 (patch)
tree6c2ed430996167ece380b59d24a6d22866230c69
parent06a2dc42b2aad23550e378b6a4dd65bd930133a3 (diff)
Fixed #857 -- Changed default session cookie name from hotclub to sessionid. Django is now 10% less pornish.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py2
-rw-r--r--docs/sessions.txt6
-rw-r--r--docs/settings.txt6
3 files changed, 5 insertions, 9 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 565f72cfaf..7271f9c69a 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -193,7 +193,7 @@ MIDDLEWARE_CLASSES = (
# SESSIONS #
############
-SESSION_COOKIE_NAME = 'hotclub' # Cookie name. This can be whatever you want.
+SESSION_COOKIE_NAME = 'sessionid' # Cookie name. This can be whatever you want.
SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # Age of cookie, in seconds (default: 2 weeks).
SESSION_COOKIE_DOMAIN = None # A string like ".lawrence.com", or None for standard domain cookie.
SESSION_SAVE_EVERY_REQUEST = False # Whether to save the session data on every request.
diff --git a/docs/sessions.txt b/docs/sessions.txt
index c7d3cd9bfc..bebee3a79f 100644
--- a/docs/sessions.txt
+++ b/docs/sessions.txt
@@ -215,13 +215,11 @@ domain cookie.
SESSION_COOKIE_NAME
-------------------
-Default: ``'hotclub'``
+Default: ``'sessionid'`` (**Django development version.** Previous default was
+``'hotclub'``, which was deemed to pornish.)
The name of the cookie to use for sessions. This can be whatever you want.
-``'hotclub'`` is a reference to the Hot Club of France, the band Django
-Reinhardt played in.
-
SESSION_SAVE_EVERY_REQUEST
--------------------------
diff --git a/docs/settings.txt b/docs/settings.txt
index 66baeb0860..164407659d 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -525,14 +525,12 @@ domain cookie. See the `session docs`_.
SESSION_COOKIE_NAME
-------------------
-Default: ``'hotclub'``
+Default: ``'sessionid'`` (**Django development version.** Previous default was
+``'hotclub'``, which was deemed to pornish.)
The name of the cookie to use for sessions. This can be whatever you want.
See the `session docs`_.
-``'hotclub'`` is a reference to the Hot Club of France, the band Django
-Reinhardt played in.
-
SESSION_SAVE_EVERY_REQUEST
--------------------------