From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 23 Apr 2014 01:35:56 +0000 (+0200)
Subject: Merge branch 'master' into python2
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=6963e4742e2d7e5eb9f783a5fc0380e18d8e2cb6;hp=d76b5228df5eb50b01f4b81e6a67b8fc80bf6437

Merge branch 'master' into python2
---

diff --git a/wrw/util.py b/wrw/util.py
index 7459b6d..f70680e 100644
--- 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)