Merge pull request #78 from mrstegeman/fix-204-parsing

Fix parsing of "204 No Content" messages.

Author: benoitc

.gitignore

@@ -19,3 +19,4 @@ nohup.out
 doc/.sass-cache
 http_parser/__pycache__
 MANIFEST
+.pytest_cache/

http_parser/pyparser.py

@@ -222,7 +222,7 @@ def execute(self, data, length):
                 try:
                     to_parse = b("").join(self._buf)
                     ret = self._parse_headers(to_parse)
-                    if not ret:
+                    if type(ret) is bool and not ret:
                         return length
                     nb_parsed = nb_parsed + (len(to_parse) - ret)
                 except InvalidHeader as e:
@@ -324,7 +324,12 @@ def _parse_request_line(self, line):
     def _parse_headers(self, data):
         idx = data.find(b("\r\n\r\n"))
         if idx < 0: # we don't have all headers
-            return False
+            if self._status_code == 204 and data == b("\r\n"):
+                self._buf = []
+                self.__on_headers_complete = True
+                return 0
+            else:
+                return False
 
         # Split lines on \r\n keeping the \r\n on each line
         lines = [bytes_to_str(line) + "\r\n" for line in
@@ -395,7 +400,10 @@ def _parse_headers(self, data):
         return len(rest)
 
     def _parse_body(self):
-        if not self._chunked:
+        if self._status_code == 204 and len(self._buf) == 0:
+            self.__on_message_complete = True
+            return
+        elif not self._chunked:
             body_part = b("").join(self._buf)
             self._clen_rest -= len(body_part)
 

testing/test_response.py

@@ -0,0 +1,12 @@
+import pytest
+import io
+
+from http_parser.http import HttpStream
+from http_parser.pyparser import HttpParser as PyHttpParser
+
+
+def test_204_no_content():
+    stream = io.BytesIO(b'HTTP/1.1 204 No Content\r\n\r\n')
+    response = HttpStream(stream)
+    assert response.status_code() == 204
+    assert response.body_string() == b''