Merge moltke.seatribe.se:/usr/local/src/wrw

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