X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fform.py;fp=wrw%2Fform.py;h=902d759bc96bc4b48f90a24d0458e7665d818a5f;hp=f821ea1aad560bdc5471afec65da3c7e3cd37315;hb=f6b73d8c8c488e25c726fd4e57b8cf72a61cccf1;hpb=cbb2bf5852924803bdb13779dc0e8e88000925d6

diff --git a/wrw/form.py b/wrw/form.py
index f821ea1..902d759 100644
--- a/wrw/form.py
+++ b/wrw/form.py
@@ -6,14 +6,15 @@ __all__ = ["formdata"]
 def formparse(req):
     buf = {}
     buf.update(urllib.parse.parse_qsl(req.query, keep_blank_values=True))
-    if req.ihead.get("Content-Type") == "application/x-www-form-urlencoded":
+    ctype, ctpars = proto.pmimehead(req.ihead.get("Content-Type", ""))
+    if ctype == "application/x-www-form-urlencoded":
         try:
             rbody = req.input.read(2 ** 20)
         except IOError as exc:
             return exc
         if len(rbody) >= 2 ** 20:
             return ValueError("x-www-form-urlencoded data is absurdly long")
-        buf.update(urllib.parse.parse_qsl(rbody.decode("latin1"), keep_blank_values=True))
+        buf.update(urllib.parse.parse_qsl(rbody.decode("latin1"), encoding=ctparse.get("charset", "utf-8"), keep_blank_values=True))
     return buf
 
 class badmultipart(IOError):