From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 7 Dec 2013 21:51:13 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=dc590bea957bbffa808e6cf3f516d4ae9beda98a;hp=6d2e09cf5bf8ddfa126ca16d536f6b42e502f0ce

Merge branch 'master' into python3
---

diff --git a/wrw/proto.py b/wrw/proto.py
index cc2edb8..f03fd2b 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -1,4 +1,4 @@
-import time
+import time, calendar
 
 statusinfo = {
     400: ("Bad Request", "Invalid HTTP request."),
@@ -21,7 +21,7 @@ def phttpdate(dstr):
         return None
     tz = int(tz[1:])
     tz = (((tz / 100) * 60) + (tz % 100)) * 60
-    return time.mktime(time.strptime(dstr, "%a, %d %b %Y %H:%M:%S")) - tz - time.altzone
+    return calendar.timegm(time.strptime(dstr, "%a, %d %b %Y %H:%M:%S")) - tz
 
 def pmimehead(hstr):
     def pws(p):