From 5d22aec94d3da1fdaf9f986086e7260db65d2094 Mon Sep 17 00:00:00 2001
From: "Timon.dev" <fiedlertimon@gmail.com>
Date: Sat, 6 Dec 2025 18:24:27 +0100
Subject: [PATCH] Added a prefix for the env-variable

---
 src/common/http.ts | 2 +-
 src/node/cli.ts    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/http.ts b/src/common/http.ts
index b780c3285..9172c770d 100644
--- a/src/common/http.ts
+++ b/src/common/http.ts
@@ -25,5 +25,5 @@ export class HttpError extends Error {
 }
 
 export const CookieKeys = {
-  Session: `code-server-session${process.env?.COOKIE_SUFFIX ? "-" + process.env?.COOKIE_SUFFIX : ""}`,
+  Session: `code-server-session${process.env?.CODE_SERVER_COOKIE_SUFFIX ? "-" + process.env?.CODE_SERVER_COOKIE_SUFFIX : ""}`,
 }
diff --git a/src/node/cli.ts b/src/node/cli.ts
index 8c88445ae..7e4674eaa 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -177,7 +177,7 @@ export const options: Options<Required<UserProvidedArgs>> = {
     type: "string",
     description:
       "Adds a suffix to the cookie. This can prevent a collision of cookies for subdomains, making them explixit. \n" +
-      "Without this flag, no suffix is used. This can also be set with COOKIE_SUFFIX set to any string.",
+      "Without this flag, no suffix is used. This can also be set with CODE_SERVER_COOKIE_SUFFIX set to any string.",
   },
   "disable-file-downloads": {
     type: "boolean",
@@ -623,8 +623,8 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config
     usingEnvPassword = false
   }
 
-  if (process.env.COOKIE_SUFFIX) {
-    args["cookie-suffix"] = process.env.COOKIE_SUFFIX
+  if (process.env.CODE_SERVER_COOKIE_SUFFIX) {
+    args["cookie-suffix"] = process.env.CODE_SERVER_COOKIE_SUFFIX
   }
 
   if (process.env.GITHUB_TOKEN) {