Merge branch 'python3' of git.dolda2000.com:/srv/git/r/wrw into python3

diff --git a/wrw/resp.py b/wrw/resp.py
index 69635f8..ebd98ec 100644 (file)
--- a/wrw/resp.py
+++ b/wrw/resp.py
@@ -70,6 +70,7 @@ class redirect(dispatch.restart):
     def handle(self, req):
         req.status(self.status, "Redirect")
         req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url)
+        req.ohead["Content-Length"] = 0
         return []
 
 class unmodified(dispatch.restart):

diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index 662c171..5f1ca45 100644 (file)
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -53,7 +53,9 @@ def forreq(req, tree):
     req.ohead["Content-Type"] = "text/html; charset=utf-8"
     buf = io.BytesIO()
     htmlindenter.output(buf, tree, doctype=(doctype, dtd), charset="utf-8")
-    return [buf.getvalue()]
+    ret = buf.getvalue()
+    req.ohead["Content-Length"] = len(ret)
+    return [ret]
 
 def xhtmlresp(callable):
     def wrapper(req):