From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 23 Apr 2014 03:03:39 +0000 (+0200)
Subject: Merge branch 'master' into python2
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=69a029dcfdd72f66a31aadcd4517bb13d5803127;hp=6963e4742e2d7e5eb9f783a5fc0380e18d8e2cb6

Merge branch 'master' into python2

Conflicts:
	wrw/form.py
---

diff --git a/wrw/form.py b/wrw/form.py
index 3bad8fc..de40092 100644
--- 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