Merge branch 'canary' into eliminate-unnecessary-decodes

vercel · Mar 18, 2024 · 23c0c93 · 23c0c93
2 parents 7c7c6b3 + b39a4d5
commit 23c0c93
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -889,7 +889,11 @@ export default abstract class Server<ServerOptions extends Options = Options> {
       }
 
       const { originalRequest } = req as NodeNextRequest
-      const isHttps = !!(originalRequest?.socket as TLSSocket)?.encrypted
+      const xForwardedProto = originalRequest?.headers['x-forwarded-proto']
+      const isHttps = xForwardedProto
+        ? xForwardedProto === 'https'
+        : !!(originalRequest?.socket as TLSSocket)?.encrypted
+
       req.headers['x-forwarded-host'] ??= req.headers['host'] ?? this.hostname
       req.headers['x-forwarded-port'] ??= this.port
         ? this.port.toString()