Merge pull request #1743 from hubo1016/2.0

Fix crash on multipart/form-data post

CONTRIBUTORS.txt

@@ -67,6 +67,7 @@ Georges Dubus
 Greg Holt
 Gregory Haynes
 Günther Jena
+Hu Bo
 Hugo Herter
 Igor Pavlov
 Ingmar Steen

aiohttp/web_request.py

@@ -409,7 +409,8 @@ def post(self):
                     out.add(field.name, ff)
                 else:
                     value = yield from field.read(decode=True)
-                    if content_type.startswith('text/'):
+                    if content_type is None or \
+                            content_type.startswith('text/'):
                         charset = field.get_charset(default='utf-8')
                         value = value.decode(charset)
                     out.add(field.name, value)

tests/test_web_request.py

@@ -335,6 +335,28 @@ def test_make_too_big_request_adjust_limit(loop):
     assert len(txt) == 1024**2 + 1
 
 
+@asyncio.coroutine
+def test_multipart_formdata(loop):
+    payload = StreamReader(loop=loop)
+    payload.feed_data(b"""-----------------------------326931944431359\r
+Content-Disposition: form-data; name="a"\r
+\r
+b\r
+-----------------------------326931944431359\r
+Content-Disposition: form-data; name="c"\r
+\r
+d\r
+-----------------------------326931944431359--\r\n""")
+    content_type = "multipart/form-data; boundary="\
+                   "---------------------------326931944431359"
+    payload.feed_eof()
+    req = make_mocked_request('POST', '/',
+                              headers={'CONTENT-TYPE': content_type},
+                              payload=payload)
+    result = yield from req.post()
+    assert dict(result) == {'a': 'b', 'c': 'd'}
+
+
 @asyncio.coroutine
 def test_make_too_big_request_limit_None(loop):
     payload = StreamReader(loop=loop)