Merge branch 'master' into python2

diff --git a/wrw/util.py b/wrw/util.py
index 7459b6d..f70680e 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -258,6 +258,6 @@ class specdirty(sessiondata):
 def datecheck(req, mtime):
     if "If-Modified-Since" in req.ihead:
         rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
-        if rtime >= math.floor(mtime):
+        if rtime is not None and rtime >= math.floor(mtime):
             raise resp.unmodified()
     req.ohead["Last-Modified"] = proto.httpdate(mtime)