Merge branch 'master' into python2

Conflicts:
	wrw/form.py

diff --git a/wrw/form.py b/wrw/form.py
index 3bad8fc..de40092 100644 (file)
--- a/wrw/form.py
+++ b/wrw/form.py
@@ -7,9 +7,9 @@ def formparse(req):
     buf = {}
     buf.update(urlparse.parse_qsl(req.query))
     if req.ihead.get("Content-Type") == "application/x-www-form-urlencoded":
-        if req.input.limit > 2 ** 20:
+        rbody = req.input(2 ** 20)
+        if len(rbody) >= 2 ** 20:
             raise ValueError("x-www-form-urlencoded data is absurdly long")
-        rbody = req.input.read()
         buf.update(urlparse.parse_qsl(rbody))
     return buf