Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw

diff --git a/wrw/cookie.py b/wrw/cookie.py
index 16ddf81..4f5071a 100644 (file)
--- a/wrw/cookie.py
+++ b/wrw/cookie.py
@@ -1,4 +1,5 @@
-import Cookie
+import Cookie, time
+import proto
 
 __all__ = ["cookies", "get", "add"]
 
@@ -43,3 +44,5 @@ def get(req, name, default = None):
 
 def add(req, name, value, **kw):
     cookies(req).add(name, value, **kw)
+
+cdate = proto.httpdate

diff --git a/wrw/proto.py b/wrw/proto.py
index 3d8b96e..b1f0ab3 100644 (file)
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -1,3 +1,5 @@
+import time
+
 statusinfo = {
     400: ("Bad Request", "Invalid HTTP request."),
     401: ("Unauthorized", "Authentication must be provided for the requested resource."),

diff --git a/wrw/session.py b/wrw/session.py
index 273775b..43b9087 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -168,7 +168,9 @@ class db(object):
         return session(threading.RLock())
 
     def mkcookie(self, req, sess):
-        cookie.add(req, self.cookiename, sess.id, path=self.path)
+        cookie.add(req, self.cookiename, sess.id,
+                   path=self.path,
+                   expires=cookie.cdate(time.time() + sess.expire))
 
     def fetch(self, req):
         now = int(time.time())