fixup

aiohttp/http_parser.py

@@ -99,9 +99,9 @@ def feed_data(self, data,
                 if pos >= start_pos:
                     # line found
                     self._lines.append(data[start_pos:pos])
+                    start_pos = pos + 2
 
                     # \r\n\r\n found
-                    start_pos = pos + 2
                     if self._lines[-1] == EMPTY:
                         try:
                             msg = self.parse_message(self._lines)
@@ -150,8 +150,6 @@ def feed_data(self, data,
                             payload = EMPTY_PAYLOAD
 
                         messages.append((msg, payload))
-
-                        start_pos = start_pos+2
                 else:
                     self._tail = data[start_pos:]
                     data = EMPTY

tests/test_http_parser.py

@@ -78,14 +78,24 @@ def test_parse(parser):
     text = b'GET /test HTTP/1.1\r\n\r\n'
     messages, upgrade, tail = parser.feed_data(text)
     assert len(messages) == 1
-    msg = messages[0][0]
+    msg, _ = messages[0]
     assert msg.compression is None
     assert not msg.upgrade
     assert msg.method == 'GET'
     assert msg.path == '/test'
     assert msg.version == (1, 1)
 
 
+@asyncio.coroutine
+def test_parse_body(parser):
+    text = b'GET /test HTTP/1.1\r\nContent-Length: 4\r\n\r\nbody'
+    messages, upgrade, tail = parser.feed_data(text)
+    assert len(messages) == 1
+    _, payload = messages[0]
+    body = yield from payload.read(4)
+    assert body == b'body'
+
+
 def test_parse_delayed(parser):
     text = b'GET /test HTTP/1.1\r\n'
     messages, upgrade, tail = parser.feed_data(text)