Merge 998e544 into 466cd67

amphp · May 23, 2020 · 82593f0 · 82593f0
2 parents 466cd67 + 998e544
commit 82593f0
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 4 deletions.
diff --git a/src/Connection/DefaultConnectionFactory.php b/src/Connection/DefaultConnectionFactory.php
@@ -190,17 +190,29 @@ public function create(
                 }
 
                 if ($tlsInfo->getApplicationLayerProtocol() === 'h2') {
-                    $connection = new Http2Connection($socket);
-                    yield $connection->initialize();
+                    $http2Connection = new Http2Connection($socket);
+                    yield $http2Connection->initialize();
 
                     foreach ($request->getEventListeners() as $eventListener) {
                         yield $eventListener->completeConnectionCreation($request);
                     }
 
-                    return $connection;
+                    return $http2Connection;
                 }
             }
 
+            // Treat the presence of only HTTP/2 as prior knowledge, see https://http2.github.io/http2-spec/#known-http
+            if ($request->getProtocolVersions() === ['2']) {
+                $http2Connection = new Http2Connection($socket);
+                yield $http2Connection->initialize();
+
+                foreach ($request->getEventListeners() as $eventListener) {
+                    yield $eventListener->completeConnectionCreation($request);
+                }
+
+                return $http2Connection;
+            }
+
             if (!\array_intersect($request->getProtocolVersions(), ['1.0', '1.1'])) {
                 $socket->close();
 

diff --git a/src/Connection/Internal/Http2ConnectionProcessor.php b/src/Connection/Internal/Http2ConnectionProcessor.php
@@ -1507,7 +1507,9 @@ private function shutdown(?int $lastId = null, ?HttpException $reason = null): P
             if ($this->settings !== null) {
                 $settings = $this->settings;
                 $this->settings = null;
-                $settings->fail($reason ?? new UnprocessedRequestException(new SocketException("Connection closed")));
+
+                $message = "Connection closed before HTTP/2 settings could be received";
+                $settings->fail($reason ?? new UnprocessedRequestException(new SocketException($message)));
             }
 
             if ($this->streams) {

diff --git a/test/ClientHttpBinIntegrationTest.php b/test/ClientHttpBinIntegrationTest.php
@@ -10,6 +10,7 @@
 use Amp\CancelledException;
 use Amp\Http\Client\Body\FileBody;
 use Amp\Http\Client\Body\FormBody;
+use Amp\Http\Client\Connection\UnprocessedRequestException;
 use Amp\Http\Client\Interceptor\DecompressResponse;
 use Amp\Http\Client\Interceptor\ModifyRequest;
 use Amp\Http\Client\Interceptor\SetRequestHeaderIfUnset;
@@ -702,6 +703,48 @@ public function testConcurrentSlowNetworkInterceptor(): \Generator
         $this->assertSame(1, $json2['http2']);
     }
 
+    public function testHttp2UpgradeResponse(): \Generator
+    {
+        $request = new Request('http://nghttp2.org/');
+        $request->setHeader('connection', 'upgrade, http2-settings');
+        $request->setHeader('upgrade', 'h2c');
+        $request->setHeader('http2-settings', 'AAMAAABkAARAAAAAAAIAAAAA');
+
+        $this->expectException(HttpException::class);
+        $this->expectExceptionMessage('CONNECT or upgrade request made without upgrade handler callback');
+
+        /** @var Response $response */
+        yield $this->executeRequest($request);
+    }
+
+    public function testHttp2PriorKnowledge(): \Generator
+    {
+        $request = new Request('http://nghttp2.org/');
+        $request->setProtocolVersions(['2']);
+
+        /** @var Response $response */
+        $response = yield $this->executeRequest($request);
+
+        $this->assertSame(200, $response->getStatus());
+        $this->assertSame('2', $response->getProtocolVersion());
+    }
+
+    public function testHttp2PriorKnowledgeUnsupported(): \Generator
+    {
+        $request = new Request('http://github.com/');
+        $request->setProtocolVersions(['2']);
+
+        $this->expectException(SocketException::class);
+        $this->expectExceptionMessage('Connection closed before HTTP/2 settings could be received');
+
+        try {
+            /** @var Response $response */
+            yield $this->executeRequest($request);
+        } catch (UnprocessedRequestException $e) {
+            throw $e->getPrevious();
+        }
+    }
+
     protected function setUp(): void
     {
         parent::setUp();