Merge branch 'master' into python3

diff --git a/wrw/proto.py b/wrw/proto.py
index 96a8878..0e49379 100644 (file)
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -103,10 +103,12 @@ def simpleerror(env, startreq, code, title, msg):
     return [buf]
 
 def urlq(url):
+    if isinstance(url, unicode):
+        url = url.encode("utf-8")
     ret = ""
     invalid = "&=#?/\"'"
     for c in url:
-        if c in invalid or (ord(c) <= 32):
+        if c in invalid or (ord(c) <= 32) or (ord(c) >= 128):
             ret += "%%%02X" % ord(c)
         else:
             ret += c

diff --git a/wrw/sp/util.py b/wrw/sp/util.py
index ad99e8b..0728a7e 100644 (file)
--- a/wrw/sp/util.py
+++ b/wrw/sp/util.py
@@ -235,5 +235,7 @@ class response(dispatch.restart):
         raise Exception("a subclass of wrw.sp.util.response must override ctype")
 
     def handle(self, req):
+        ret = self.formatter.format(self.root, doctype=self.doctype, charset=self.charset)
         req.ohead["Content-Type"] = self.ctype
-        return [self.formatter.format(self.root, doctype=self.doctype, charset=self.charset)]
+        req.ohead["Content-Length"] = len(ret)
+        return [ret]