X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fproto.py;h=482a23ead18d2bef26a415ab22a990ae1680f46d;hp=8c8dcee1b0d54d398fa681d56f9bb12ab1d0f3a5;hb=69eb6cbefcf769276e3e15c6f20e9d5af74fd326;hpb=3985f4bbbfd3740d955ec766fb5fb912efcb0d59

diff --git a/wrw/proto.py b/wrw/proto.py
index 8c8dcee..482a23e 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):
@@ -98,17 +98,20 @@ def simpleerror(env, startreq, code, title, msg):
 </body>
 </html>
 """ % (title, title, htmlq(msg))
+    buf = buf.encode("us-ascii")
     startreq("%i %s" % (code, title), [("Content-Type", "text/html"), ("Content-Length", str(len(buf)))])
     return [buf]
 
 def urlq(url):
+    if isinstance(url, str):
+        url = url.encode("utf-8")
     ret = ""
-    invalid = "&=#?/\"'"
+    invalid = b"%;&=#?/\"'"
     for c in url:
-        if c in invalid or (ord(c) <= 32):
-            ret += "%%%02X" % ord(c)
+        if c in invalid or (c <= 32) or (c >= 128):
+            ret += "%%%02X" % c
         else:
-            ret += c
+            ret += chr(c)
     return ret
 
 class urlerror(ValueError):