From f6789eaf39face7e1d126bfe6efc77c29b9efa7c Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 11:14:52 -0500
Subject: [PATCH] session cookie data no expires by default

---
 VERSION          | 2 +-
 gluon/globals.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 100f8195..b04cf02b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 11:08:39) dev
+Version 2.1.1 (2012-10-16 11:14:48) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index 29a4deff..afec83fe 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -468,6 +468,7 @@ class Session(Storage):
         separate = None,
         check_client=False,
         cookie_key=None,
+        cookie_expires=FUTURE,
         ):
         """
         separate can be separate=lambda(session_name): session_name[-2:]
@@ -504,6 +505,7 @@ class Session(Storage):
         if cookie_key:
             response.session_storage_type = 'cookie'
             response.session_cookie_key = cookie_key
+            response.session_data_expires = cookie_expires
             if session_cookie_data:
                 data = secure_loads(session_cookie_data,cookie_key)
                 if data:
@@ -647,9 +649,12 @@ class Session(Storage):
     def _try_store_in_cookie(self, request, response):
         if response.session_storage_type!='cookie': return False
         value = secure_dumps(dict(self),response.session_cookie_key)
+        response.cookies.pop(response.session_data_name,None)            
         response.cookies[response.session_data_name] = value
         response.cookies[response.session_data_name]['path'] = '/'
-        response.cookies[response.session_data_name]['expires'] = FUTURE
+        expires = response.session_data_expires
+        if expires: 
+            response.cookies[response.session_data_name]['expires'] = expires
         return True
 
     def _unchanged(self):