Merge branch 'master' into python2

diff --git a/wrw/proto.py b/wrw/proto.py
index 36a9db9..7cb6d31 100644 (file)
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -191,7 +191,7 @@ def parstring(pars={}, **augment):
 def parurl(url, pars={}, **augment):
     qs = parstring(pars, **augment)
     if qs != "":
-        return url + "?" + qs
+        return url + ("&" if "?" in url else "?") + qs
     else:
         return url
 

diff --git a/wrw/req.py b/wrw/req.py
index 41fd330..ebc3fd8 100644 (file)
--- a/wrw/req.py
+++ b/wrw/req.py
@@ -230,6 +230,7 @@ class copyrequest(request):
         self.https = p.https
         self.ihead = p.ihead
         self.ohead = p.ohead
+        self.input = p.input
 
     def status(self, code, msg):
         return self.parent.status(code, msg)