From: Fredrik Tolf Date: Wed, 23 Apr 2014 03:03:39 +0000 (+0200) Subject: Merge branch 'master' into python2 X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=69a029dcfdd72f66a31aadcd4517bb13d5803127;p=wrw.git Merge branch 'master' into python2 Conflicts: wrw/form.py --- 69a029dcfdd72f66a31aadcd4517bb13d5803127 diff --cc wrw/form.py index 3bad8fc,a57a812..de40092 --- a/wrw/form.py +++ b/wrw/form.py @@@ -5,12 -5,12 +5,12 @@@ __all__ = ["formdata" def formparse(req): buf = {} - buf.update(urllib.parse.parse_qsl(req.query)) + 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(urllib.parse.parse_qsl(rbody.decode("latin1"))) + buf.update(urlparse.parse_qsl(rbody)) return buf class badmultipart(Exception):