Merge pull request #157 from clue-labs/options

Support asterisk-form request target for OPTIONS method

Author: clue

src/RequestHeaderParser.php

@@ -55,8 +55,20 @@ private function parseRequest($data)
     {
         list($headers, $bodyBuffer) = explode("\r\n\r\n", $data, 2);
 
+        $asterisk = false;
+        if (strpos($headers, 'OPTIONS * ') === 0) {
+            $asterisk = true;
+            $headers = 'OPTIONS / ' . substr($headers, 10);
+        }
+
         $request = g7\parse_request($headers);
 
+        if ($asterisk) {
+            $request = $request->withUri(
+                $request->getUri()->withPath('')
+            )->withRequestTarget('*');
+        }
+
         return array($request, $bodyBuffer);
     }
 }

tests/ServerTest.php

@@ -98,10 +98,31 @@ function ($data) use (&$buffer) {
 
         $this->assertSame(1, $i);
         $this->assertInstanceOf('RingCentral\Psr7\Request', $requestAssertion);
-        $this->assertSame('/', $requestAssertion->getUri()->getPath());
         $this->assertSame('GET', $requestAssertion->getMethod());
+        $this->assertSame('/', $requestAssertion->getRequestTarget());
+        $this->assertSame('/', $requestAssertion->getUri()->getPath());
+        $this->assertSame('http://example.com/', (string)$requestAssertion->getUri());
         $this->assertSame('127.0.0.1', $requestAssertion->remoteAddress);
+    }
+
+    public function testRequestOptionsAsterisk()
+    {
+        $requestAssertion = null;
+        $server = new Server($this->socket, function ($request) use (&$requestAssertion) {
+            $requestAssertion = $request;
+            return new Response();
+        });
+
+        $this->socket->emit('connection', array($this->connection));
 
+        $data = "OPTIONS * HTTP/1.1\r\nHost: example.com\r\n\r\n";
+        $this->connection->emit('data', array($data));
+
+        $this->assertInstanceOf('RingCentral\Psr7\Request', $requestAssertion);
+        $this->assertSame('OPTIONS', $requestAssertion->getMethod());
+        $this->assertSame('*', $requestAssertion->getRequestTarget());
+        $this->assertSame('', $requestAssertion->getUri()->getPath());
+        $this->assertSame('http://example.com', (string)$requestAssertion->getUri());
     }
 
     public function testRequestPauseWillbeForwardedToConnection()