Merge pull request #130 from clue-labs/legacy-line-feed

WyriHaximus · web-flow · commit 22e87bc0a261 · 2018-04-09T09:06:27.000+02:00
Support legacy HTTP servers that use only LF instead of CRLF
diff --git a/src/Request.php b/src/Request.php
@@ -134,7 +134,8 @@ public function handleData($data)
     {
         $this->buffer .= $data;
 
-        if (false !== strpos($this->buffer, "\r\n\r\n")) {
+        // buffer until double CRLF (or double LF for compatibility with legacy servers)
+        if (false !== strpos($this->buffer, "\r\n\r\n") || false !== strpos($this->buffer, "\n\n")) {
             try {
                 list($response, $bodyChunk) = $this->parseResponse($this->buffer);
             } catch (\InvalidArgumentException $exception) {
diff --git a/tests/FunctionalIntegrationTest.php b/tests/FunctionalIntegrationTest.php
@@ -29,6 +29,29 @@ public function testRequestToLocalhostEmitsSingleRemoteConnection()
         $loop->run();
     }
 
+    public function testRequestLegacyHttpServerWithOnlyLineFeedReturnsSuccessfulResponse()
+    {
+        $loop = Factory::create();
+
+        $server = new Server(0, $loop);
+        $server->on('connection', function (ConnectionInterface $conn) use ($server) {
+            $conn->end("HTTP/1.0 200 OK\n\nbody");
+            $server->close();
+        });
+
+        $client = new Client($loop);
+        $request = $client->request('GET', str_replace('tcp:', 'http:', $server->getAddress()));
+
+        $once = $this->expectCallableOnceWith('body');
+        $request->on('response', function (Response $response) use ($once) {
+            $response->on('data', $once);
+        });
+
+        $request->end();
+
+        $loop->run();
+    }
+
     /** @group internet */
     public function testSuccessfulResponseEmitsEnd()
     {
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -26,6 +26,17 @@ protected function expectCallableOnce()
         return $mock;
     }
 
+    protected function expectCallableOnceWith($value)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($value);
+
+        return $mock;
+    }
+
     protected function expectCallableNever()
     {
         $mock = $this->createCallableMock();

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ public function handleData($data)`
`134`	`134`	`{`
`135`	`135`	`$this->buffer .= $data;`
`136`	`136`
`137`		`- if (false !== strpos($this->buffer, "\r\n\r\n")) {`
	`137`	`+ // buffer until double CRLF (or double LF for compatibility with legacy servers)`
	`138`	`+ if (false !== strpos($this->buffer, "\r\n\r\n") \|\| false !== strpos($this->buffer, "\n\n")) {`
`138`	`139`	`try {`
`139`	`140`	`list($response, $bodyChunk) = $this->parseResponse($this->buffer);`
`140`	`141`	`} catch (\InvalidArgumentException $exception) {`