Merge branch 'lsbardel-lsbardel'

Author: benoitc

http_parser/pyparser.py

@@ -224,7 +224,8 @@ def execute(self, data, length):
                 try:
                     to_parse = b("").join(self._buf)
                     ret = self._parse_headers(to_parse)
-                    if type(ret) is bool and not ret:
+
+                    if ret is False:
                         return length
                     nb_parsed = nb_parsed + (len(to_parse) - ret)
                 except InvalidHeader as e:
@@ -324,6 +325,10 @@ def _parse_request_line(self, line):
                 "SERVER_PROTOCOL": bits[2]})
 
     def _parse_headers(self, data):
+        if data == b'\r\n':
+            self.__on_headers_complete = True
+            self._buf = []
+            return 0
         idx = data.find(b("\r\n\r\n"))
         if idx < 0: # we don't have all headers
             if self._status_code == 204 and data == b("\r\n"):
@@ -407,6 +412,11 @@ def _parse_body(self):
             return
         elif not self._chunked:
             body_part = b("").join(self._buf)
+            #
+            if not body_part and self._clen is None:
+                if not self._status: # message complete only for servers
+                    self.__on_message_complete = True
+                return
             self._clen_rest -= len(body_part)
 
             # maybe decompress

testing/test_client.py

@@ -0,0 +1,39 @@
+import pytest
+import io
+
+from http_parser.http import HttpStream
+from http_parser.parser import HttpParser
+from http_parser.pyparser import HttpParser as PyHttpParser
+
+def _test_no_headers(parser):
+    data = b'HTTP/1.1 200 Connection established\r\n\r\n'
+    assert parser.execute(data, len(data)) == len(data)
+    assert parser.is_headers_complete()
+    assert parser.is_message_begin()
+    assert not parser.is_partial_body()
+    assert not parser.is_message_complete()
+
+def _test_headers(parser):
+    data = (b'HTTP/1.1 200 OK\r\n'
+            b'Connection: Keep-Alive\r\n'
+            b'Content-Length: 4\r\n'
+            b'Content-type: text/plain\r\n\r\n'
+            b'ciao')
+    assert parser.execute(data, len(data)) == len(data)
+    assert parser.is_headers_complete()
+    assert parser.is_message_begin()
+    assert parser.is_partial_body()
+    assert parser.is_message_complete()
+
+def test_client_no_headers():
+    _test_no_headers(HttpParser())
+
+def test_client_no_headers_py():
+    _test_no_headers(PyHttpParser())
+
+def test_client_headers():
+    _test_headers(HttpParser())
+
+def test_client_headers_py():
+    _test_headers(PyHttpParser())
+

testing/test_server.py

@@ -0,0 +1,22 @@
+import pytest
+import io
+
+from http_parser.http import HttpStream
+from http_parser.parser import HttpParser
+from http_parser.pyparser import HttpParser as PyHttpParser
+
+def _test_no_headers(parser):
+    assert not parser.is_headers_complete()
+    data = b'GET /forum/bla?page=1#post1 HTTP/1.1\r\n\r\n'
+    assert parser.execute(data, len(data)), len(data)
+    assert parser.get_fragment(), 'post1'
+    assert parser.is_message_begin()
+    assert parser.is_headers_complete()
+    assert parser.is_message_complete()
+    assert not parser.get_headers()
+
+def test_server_no_headers():
+    _test_no_headers(HttpParser())
+
+def test_server_no_headers_py():
+    _test_no_headers(PyHttpParser())