--- a/wsgi/request.py Mon Sep 01 14:56:00 2014 +0200
+++ b/wsgi/request.py Mon Sep 15 17:23:22 2014 +0200
@@ -32,7 +32,9 @@
from urlparse import parse_qs
from warnings import warn
-from cubicweb.multipart import copy_file, parse_form_data
+from cubicweb.multipart import (
+ copy_file, parse_form_data, MultipartError, parse_options_header)
+from cubicweb.web import RequestError
from cubicweb.web.request import CubicWebRequestBase
from cubicweb.wsgi import pformat, normalize_header
@@ -148,9 +150,18 @@
post = parse_qs(self.environ.get('QUERY_STRING', ''))
files = None
if self.method == 'POST':
- forms, files = parse_form_data(self.environ, strict=True,
- mem_limit=self.vreg.config['max-post-length'])
- post.update(forms.dict)
+ content_type = self.environ.get('CONTENT_TYPE')
+ if not content_type:
+ raise RequestError("Missing Content-Type")
+ content_type, options = parse_options_header(content_type)
+ if content_type in (
+ 'multipart/form-data',
+ 'application/x-www-form-urlencoded',
+ 'application/x-url-encoded'):
+ forms, files = parse_form_data(
+ self.environ, strict=True,
+ mem_limit=self.vreg.config['max-post-length'])
+ post.update(forms.dict)
self.content.seek(0, 0)
return post, files