Fix cache control in image optimizer

vercel · Feb 23, 2025 · 158bf76 · 158bf76
1 parent 1a2967e
commit 158bf76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/packages/next/src/server/image-optimizer.ts b/packages/next/src/server/image-optimizer.ts
@@ -416,7 +416,7 @@ export class ImageOptimizerCache {
           revalidateAfter:
             Math.max(maxAge, this.nextConfig.images.minimumCacheTTL) * 1000 +
             Date.now(),
-          cacheControl: { revalidate: maxAge, expire: expireAt },
+          cacheControl: { revalidate: maxAge },
           isStale: now > expireAt,
           isFallback: false,
         }
@@ -445,11 +445,9 @@ export class ImageOptimizerCache {
       throw new InvariantError('revalidate must be a number for image-cache')
     }
 
-    const expire =
-      cacheControl?.expire ??
-      Math.max(revalidate, this.nextConfig.images.minimumCacheTTL) * 1000
-
-    const expireAt = expire + Date.now()
+    const expireAt =
+      Math.max(revalidate, this.nextConfig.images.minimumCacheTTL) * 1000 +
+      Date.now()
 
     try {
       await writeToCacheDir(

diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -957,7 +957,7 @@ export default class NextNodeServer extends BaseServer<
                 upstreamEtag,
               },
               isFallback: false,
-              revalidate: maxAge,
+              cacheControl: { revalidate: maxAge },
             }
           },
           {