support for range and content nego headers

Lctrs · Lctrs · commit 9ccf33244ecf · 2025-08-27T23:54:49.000+02:00
diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
@@ -34,12 +34,10 @@
  * Adds caching on top of an HTTP client (per RFC 9111).
  *
  * Known omissions / partially supported features per RFC 9111:
- *   1. Range requests:
- *     - All range requests ("partial content") are passed through and never cached.
- *   2. stale-while-revalidate:
+ *   1. stale-while-revalidate:
  *     - There's no actual "background revalidation" for stale responses, they will
  *       always be revalidated.
- *   3. min-fresh, max-stale, only-if-cached:
+ *   2. min-fresh, max-stale, only-if-cached:
  *     - Request directives are not parsed; the client ignores them.
  *
  * @see https://www.rfc-editor.org/rfc/rfc9111
@@ -68,6 +66,21 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface
      * The HTTP methods that will trigger a cache invalidation.
      */
     private const UNSAFE_METHODS = ['POST', 'PUT', 'DELETE', 'PATCH'];
+    /**
+     * Headers that influence the response and may affect caching behavior.
+     */
+    private const RESPONSE_INFLUENCING_HEADERS = [
+        'accept' => true,
+        'accept-charset' => true,
+        'accept-encoding' => true,
+        'accept-language' => true,
+        'authorization' => true,
+        'cookie' => true,
+        'expect' => true,
+        'host' => true,
+        'range' => true,
+        'user-agent' => true,
+    ];
     /**
      * Headers that MUST NOT be stored as per RFC 9111 Section 3.1.
      */
@@ -144,16 +157,24 @@ public function request(string $method, string $url, array $options = []): Respo
             $this->cache->invalidateTags([$fullUrlTag]);
         }
 
-        if ('' !== $options['body'] || isset($options['normalized_headers']['range']) || !\in_array($method, self::CACHEABLE_METHODS, true)) {
+        if ('' !== $options['body'] || !\in_array($method, self::CACHEABLE_METHODS, true)) {
             return new AsyncResponse($this->client, $method, $url, $options);
         }
 
-        $requestHash = self::hash($method.$fullUrl);
+        $requestHash = self::hash($method.$fullUrl.json_encode(array_intersect_key($options['normalized_headers'], self::RESPONSE_INFLUENCING_HEADERS), \JSON_THROW_ON_ERROR));
         $varyKey = "vary_{$requestHash}";
-        $varyFields = $this->cache->get($varyKey, static fn (): array => []);
+        $varyFields = $this->cache->get($varyKey, static function (ItemInterface $item, bool &$save): array {
+            $save = false;
+
+            return [];
+        });
 
         $metadataKey = self::getMetadataKey($requestHash, $options['normalized_headers'], $varyFields);
-        $cachedData = $this->cache->get($metadataKey, static fn (): null => null);
+        $cachedData = $this->cache->get($metadataKey, static function (ItemInterface $item, bool &$save): null {
+            $save = false;
+
+            return null;
+        });
 
         $freshness = null;
         if (\is_array($cachedData)) {
diff --git a/src/Symfony/Component/HttpClient/Tests/CachingHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CachingHttpClientTest.php
@@ -870,4 +870,29 @@ public function testHeuristicFreshnessWithLastModified()
         self::assertSame(200, $response->getStatusCode());
         self::assertSame('bar', $response->getContent());
     }
+
+    public function testResponseInfluencingHeadersAffectCacheKey()
+    {
+        $mockClient = new MockHttpClient([
+            new MockResponse('response for en', ['http_code' => 200]),
+            new MockResponse('response for fr', ['http_code' => 200]),
+        ]);
+
+        $client = new CachingHttpClient($mockClient, $this->cacheAdapter);
+
+        // First request with Accept-Language: en
+        $response = $client->request('GET', 'http://example.com/lang-test', ['headers' => ['Accept-Language' => 'en']]);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('response for en', $response->getContent());
+
+        // Same request with Accept-Language: en should return cached response
+        $response = $client->request('GET', 'http://example.com/lang-test', ['headers' => ['Accept-Language' => 'en']]);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('response for en', $response->getContent());
+
+        // Request with Accept-Language: fr should fetch new response
+        $response = $client->request('GET', 'http://example.com/lang-test', ['headers' => ['Accept-Language' => 'fr']]);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('response for fr', $response->getContent());
+    }
 }
