Reverted body buffering introduced in aae037d.

Author: Bilge

composer.json

@@ -10,7 +10,7 @@
   "license": "LGPL-3.0",
   "require": {
     "php": "^8.1",
-    "amphp/http-client": "^5.1",
+    "amphp/http-client": "^5.3.3",
     "amphp/http-client-cookies": "^2",
     "scriptfusion/porter": "^7|^8"
   },

src/HttpResponse.php

@@ -3,6 +3,7 @@
 
 namespace ScriptFUSION\Porter\Net\Http;
 
+use Amp\ByteStream\Payload;
 use Amp\Http\Client\Response;
 
 /**
@@ -15,7 +16,8 @@ final class HttpResponse
     private int $statusCode;
     private string $statusPhrase;
     private ?self $previous;
-    private string $bufferedBody;
+    private Payload $body;
+    private string $bodyBuffer;
 
     public function __construct(Response $ampResponse)
     {
@@ -24,8 +26,7 @@ public function __construct(Response $ampResponse)
         $this->statusCode = $ampResponse->getStatus();
         $this->statusPhrase = $ampResponse->getReason();
         $this->previous = $ampResponse->getPreviousResponse() ? new self($ampResponse->getPreviousResponse()) : null;
-        // We must buffer body immediately, otherwise we get memory leaks.
-        $this->bufferedBody = $ampResponse->getBody()->isReadable() ? $ampResponse->getBody()->buffer() : '';
+        $this->body = $ampResponse->getBody();
     }
 
     public function __toString(): string
@@ -59,7 +60,7 @@ public function getHeader(string $name): array
 
     public function getBody(): string
     {
-        return $this->bufferedBody;
+        return $this->bodyBuffer ??= $this->body->buffer();
     }
 
     public function getStatusCode(): int

test/Functional/HttpConnectorTest.php

@@ -209,7 +209,7 @@ public function testDefaultBodyLengthTooLong(): void
         $this->expectException(StreamException::class);
 
         try {
-            $this->fetch(self::buildDataSource('big.php'));
+            $this->fetch(self::buildDataSource('big.php'))->getBody();
         } finally {
             $this->stopServer($server);
         }
@@ -227,7 +227,7 @@ public function testCustomBodyLengthTooLong(): void
         $this->expectException(StreamException::class);
 
         try {
-            $this->fetch(self::buildDataSource());
+            $this->fetch(self::buildDataSource())->getBody();
         } finally {
             $this->stopServer($server);
         }
@@ -243,12 +243,25 @@ public function testCustomBodyLengthOverride(): void
         $this->expectException(StreamException::class);
 
         try {
-            $this->fetch(self::buildDataSource()->setMaxBodyLength(1));
+            $this->fetch(self::buildDataSource()->setMaxBodyLength(1))->getBody();
         } finally {
             $this->stopServer($server);
         }
     }
 
+    public function testUserAgentOverride(): void
+    {
+        $server = $this->startServer();
+
+        try {
+            $response = $this->fetch(self::buildDataSource()->addHeader($h = 'user-agent', $v = 'Alfa'))->getBody();
+        } finally {
+            $this->stopServer($server);
+        }
+
+        self::assertMatchesRegularExpression("[^$h: $v$]m", $response);
+    }
+
     private function startServer(): Process
     {
         $server = new Process([PHP_BINARY, '-S', self::HOST, '-t', self::DIR]);