Merge branch 'master' into python3

Conflicts:
	wrw/cookie.py

diff --git a/wrw/cookie.py b/wrw/cookie.py
index 3a3c916..b66e293 100644 (file)
--- a/wrw/cookie.py
+++ b/wrw/cookie.py
@@ -1,4 +1,5 @@
-import http.cookies
+import http.cookies, time
+from . 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 881f4e4..ab3737b 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/req.py b/wrw/req.py
index 82a1f84..0348c81 100644 (file)
--- a/wrw/req.py
+++ b/wrw/req.py
@@ -70,6 +70,7 @@ class origrequest(request):
         self.query = env["QUERY_STRING"]
         self.remoteaddr = env["REMOTE_ADDR"]
         self.serverport = env["SERVER_PORT"]
+        self.servername = env["SERVER_NAME"]
         self.https = "HTTPS" in env
         self.ihead = headdict()
         self.ohead = headdict()

diff --git a/wrw/session.py b/wrw/session.py
index d9907cc..0a17c6d 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())