X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fproto.py;h=0e49379e391fb5e59a9f865f6a4a6078f92b6434;hb=199cdc4055921d7497e5a6b9a132ac44d04e9894;hp=4cf19519bb739832d841defe522ae5a49f80ec6a;hpb=10ba659d32518d2d09b12ada86a380798b378fe7;p=wrw.git

diff --git a/wrw/proto.py b/wrw/proto.py
index 4cf1951..0e49379 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -98,13 +98,17 @@ 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, unicode):
+        url = url.encode("utf-8")
     ret = ""
+    invalid = "&=#?/\"'"
     for c in url:
-        if c == "&" or c == "=" or c == "#" or c == "?" or c == "/" or (ord(c) <= 32):
+        if c in invalid or (ord(c) <= 32) or (ord(c) >= 128):
             ret += "%%%02X" % ord(c)
         else:
             ret += c