Throws TimeoutException when TransferTimeout is exceeded (#382)

Author: luzrain

src/Connection/Http1Connection.php

@@ -481,6 +481,7 @@ private function readResponse(
             }
 
             $originalCancellation->throwIfRequested();
+            $readingCancellation->throwIfRequested();
 
             throw new SocketException(\sprintf(
                 "Receiving the response headers for '%s' failed, because the socket to '%s' @ '%s' closed early with %d bytes received within %0.3f seconds",
@@ -499,11 +500,11 @@ private function readResponse(
             // Throw original cancellation if it was requested.
             $originalCancellation->throwIfRequested();
 
-            throw new TimeoutException(
-                'Inactivity timeout exceeded, more than ' . $timeout . ' seconds elapsed from last data received',
-                0,
-                $e
-            );
+            if ($readingCancellation->isRequested()) {
+                throw new TimeoutException('Allowed transfer timeout exceeded, took longer than ' . $request->getTransferTimeout() . ' s', 0, $e);
+            }
+
+            throw new TimeoutException('Inactivity timeout exceeded, more than ' . $timeout . ' seconds elapsed from last data received', 0, $e);
         } catch (\Throwable $e) {
             $this->close();
             throw new SocketException('Receiving the response headers failed: ' . $e->getMessage(), 0, $e);

test/TimeoutTest.php

@@ -60,7 +60,7 @@ public function testTimeoutDuringBody(): void
 
     public function testTimeoutDuringConnect(): void
     {
-        $this->setTimeout(0.6);
+        $this->setTimeout(1);
 
         $connector = $this->createMock(Socket\SocketConnector::class);
         $connector->method('connect')
@@ -99,7 +99,7 @@ public function testTimeoutDuringTlsEnable(): void
             }
         });
 
-        $this->setTimeout(0.6);
+        $this->setTimeout(1);
 
         try {
             $uri = "https://" . $server->getAddress() . "/";
@@ -223,7 +223,7 @@ public function testTimeoutDuringTlsEnableInterceptor(): void
             }
         });
 
-        $this->setTimeout(0.6);
+        $this->setTimeout(1);
 
         try {
             $uri = "https://" . $server->getAddress() . "/";
@@ -275,4 +275,46 @@ public function testTimeoutDuringInactivity(): void
             $server->close();
         }
     }
+
+    public function testTransferTimeoutDuringRequest(): void
+    {
+        $server = listen("tcp://127.0.0.1:0");
+
+        $this->setTimeout(1);
+
+        try {
+            $uri = "http://" . $server->getAddress() . "/";
+
+            $request = new Request($uri);
+            $request->setTransferTimeout(0.1);
+
+            $this->expectException(TimeoutException::class);
+            $this->expectExceptionMessage("Allowed transfer timeout exceeded, took longer than 0.1 s");
+
+            $this->client->request($request);
+        } finally {
+            $server->close();
+        }
+    }
+
+    public function testInactivityTimeoutDuringRequest(): void
+    {
+        $server = listen("tcp://127.0.0.1:0");
+
+        $this->setTimeout(1);
+
+        try {
+            $uri = "http://" . $server->getAddress() . "/";
+
+            $request = new Request($uri);
+            $request->setInactivityTimeout(0.1);
+
+            $this->expectException(TimeoutException::class);
+            $this->expectExceptionMessage("Inactivity timeout exceeded, more than 0.1 seconds elapsed from last data received");
+
+            $this->client->request($request);
+        } finally {
+            $server->close();
+        }
+    }
 }