From 9337daf7ac6dc397bf4595cb16fc8b9d8aeeda42 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Fri, 8 May 2026 11:15:17 +0530 Subject: [PATCH] Preserve default storage cache hit max age --- app/init/resources.php | 5 +++++ tests/e2e/Services/Storage/StorageBase.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/init/resources.php b/app/init/resources.php index c5d034a125..edd75e33d4 100644 --- a/app/init/resources.php +++ b/app/init/resources.php @@ -9,6 +9,7 @@ use Appwrite\Event\Publisher\Migration as MigrationPublisher; use Appwrite\Event\Publisher\Screenshot as ScreenshotPublisher; use Appwrite\Event\Publisher\StatsResources as StatsResourcesPublisher; use Appwrite\Event\Publisher\Usage as UsagePublisher; +use Appwrite\Platform\Modules\Storage\Config\CacheControl; use Appwrite\Platform\Modules\Storage\Config\StorageCacheControl; use Appwrite\Utopia\Database\Documents\User; use Executor\Executor; @@ -205,6 +206,10 @@ $container->set('cache', function (Group $pools, Telemetry $telemetry) { }, ['pools', 'telemetry']); $container->set('cacheControlForStorage', fn () => function (StorageCacheControl $config): string { + if ($config->source === CacheControl::SOURCE_CACHE) { + return 'private, max-age=15552000'; + } + return \sprintf('private, max-age=%d', $config->maxAge); }); diff --git a/tests/e2e/Services/Storage/StorageBase.php b/tests/e2e/Services/Storage/StorageBase.php index 5e09031a9c..56112101bf 100644 --- a/tests/e2e/Services/Storage/StorageBase.php +++ b/tests/e2e/Services/Storage/StorageBase.php @@ -1015,7 +1015,7 @@ trait StorageBase $this->assertEquals(200, $cachedPreview['headers']['status-code']); $this->assertEquals('image/png', $cachedPreview['headers']['content-type']); - $this->assertStringStartsWith('private, max-age=', $cachedPreview['headers']['cache-control']); + $this->assertEquals('private, max-age=15552000', $cachedPreview['headers']['cache-control']); $this->assertEquals($preview['body'], $cachedPreview['body']); }