Use proper parser.

Author: Lukasa

hyper/http11/connection.py

@@ -10,6 +10,7 @@
 import socket
 
 from .response import HTTP11Response
+from .parser import Parser
 from ..tls import wrap_socket, H2_NPN_PROTOCOLS
 from ..http20.bufsocket import BufferedSocket
 from ..common.headers import HTTPHeaderMap
@@ -63,6 +64,10 @@ def __init__(self, host, port=None, secure=None):
         #: Defaults to 64kB.
         self.network_buffer_size = 65536
 
+        #: The object used to perform HTTP/1.1 parsing. Needs to conform to
+        #: the standard hyper parsing interface.
+        self.parser = Parser()
+
     def connect(self):
         """
         Connect to the server specified when the object was created. This is a
@@ -132,21 +137,23 @@ def get_response(self):
         """
         headers = HTTPHeaderMap()
 
-        # First read the header line and 'parse' it.
-        status_line = self._sock.readline().tobytes().rstrip()
-        version, code, reason = status_line.split(b' ', 2)
-        code = int(code)
+        response = None
+        while response is None:
+            # 'encourage' the socket to receive data.
+            self._sock.fill()
+            response = self.parser.parse_response(self._sock.buffer)
 
-        while True:
-            line = self._sock.readline().tobytes()
-            if len(line) <= 2:
-                break
+        for n, v in response.headers:
+            headers[n.tobytes()] = v.tobytes()
 
-            name, val = line.split(b':', 1)
-            val = val.lstrip().rstrip(b'\r\n')
-            headers[name] = val
+        self._sock.advance_buffer(response.consumed)
 
-        return HTTP11Response(code, reason, headers, self._sock)
+        return HTTP11Response(
+            response.status,
+            response.msg.tobytes(),
+            headers,
+            self._sock
+        )
 
     def _send_headers(self, method, url, headers):
         """

test/test_http11.py

@@ -188,7 +188,7 @@ def test_get_response(self):
         c = HTTP11Connection('http2bin.org')
         c._sock = sock = DummySocket()
 
-        sock.buffer= BytesIO(
+        sock._buffer= BytesIO(
             b"HTTP/1.1 201 No Content\r\n"
             b"Connection: close\r\n"
             b"Server: Socket\r\n"
@@ -211,7 +211,7 @@ def test_response_short_reads(self):
         c = HTTP11Connection('http2bin.org')
         c._sock = sock = DummySocket()
 
-        sock.buffer= BytesIO(
+        sock._buffer= BytesIO(
             b"HTTP/1.1 200 OK\r\n"
             b"Content-Length: 15\r\n"
             b"\r\n"
@@ -301,23 +301,33 @@ def test_short_circuit_read(self):
 class DummySocket(object):
     def __init__(self):
         self.queue = []
-        self.buffer = BytesIO()
+        self._buffer = BytesIO()
         self.can_read = False
 
+    @property
+    def buffer(self):
+        return memoryview(self._buffer.getvalue())
+
+    def advance_buffer(self, amt):
+        self._buffer.read(amt)
+
     def send(self, data):
         if not isinstance(data, bytes):
             raise TypeError()
 
         self.queue.append(data)
 
     def recv(self, l):
-        return memoryview(self.buffer.read(l))
+        return memoryview(self._buffer.read(l))
 
     def close(self):
         pass
 
     def readline(self):
-        return memoryview(self.buffer.readline())
+        return memoryview(self._buffer.readline())
+
+    def fill(self):
+        pass
 
 
 class DummyFile(object):