diff MoinMoin/config/multiconfig.py @ 4085:afd75bb5f345

merge moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 12 Sep 2008 22:23:53 +0200
parents 0cdc180a2932 be4cefe2a219
children 1cd493d5e113
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Mon Sep 08 11:58:03 2008 +0200
+++ b/MoinMoin/config/multiconfig.py	Fri Sep 12 22:23:53 2008 +0200
@@ -699,6 +699,8 @@
      "See HelpOnSessions."),
     ('session_id_handler', DefaultExpression('session.MoinCookieSessionIDHandler()'),
      "Only used by the DefaultSessionHandler, see HelpOnSessions."),
+    ('cookie_secure', None,
+     'Use secure cookie. (None = auto-enable secure cookie for https, True = ever use secure cookie, False = never use secure cookie).'),
     ('cookie_domain', None,
      'Domain used in the session cookie. (None = do not specify domain).'),
     ('cookie_path', None,