bug #47143 [HttpClient] Fix memory leak when using StreamWrapper (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 25c2131bc058 · 2022-08-01T18:48:47.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] Fix memory leak when using StreamWrapper | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #46256 | License | MIT | Doc PR | - As hinted in php/php-src#8548 Commits ------- 16d0176 [HttpClient] Fix memory leak when using StreamWrapper
diff --git a/src/Symfony/Component/HttpClient/Response/StreamWrapper.php b/src/Symfony/Component/HttpClient/Response/StreamWrapper.php
@@ -53,20 +53,18 @@ public static function createResource(ResponseInterface $response, HttpClientInt
             throw new \InvalidArgumentException(sprintf('Providing a client to "%s()" is required when the response doesn\'t have any "stream()" method.', __CLASS__));
         }
 
-        if (false === stream_wrapper_register('symfony', __CLASS__)) {
+        static $registered = false;
+
+        if (!$registered = $registered || stream_wrapper_register(strtr(__CLASS__, '\\', '-'), __CLASS__)) {
             throw new \RuntimeException(error_get_last()['message'] ?? 'Registering the "symfony" stream wrapper failed.');
         }
 
-        try {
-            $context = [
-                'client' => $client ?? $response,
-                'response' => $response,
-            ];
-
-            return fopen('symfony://'.$response->getInfo('url'), 'r', false, stream_context_create(['symfony' => $context])) ?: null;
-        } finally {
-            stream_wrapper_unregister('symfony');
-        }
+        $context = [
+            'client' => $client ?? $response,
+            'response' => $response,
+        ];
+
+        return fopen(strtr(__CLASS__, '\\', '-').'://'.$response->getInfo('url'), 'r', false, stream_context_create(['symfony' => $context]));
     }
 
     public function getResponse(): ResponseInterface
