From 96cc1ad55acd077f7e3ecc18685b7cee0cb58e18 Mon Sep 17 00:00:00 2001
From: Mikk Andresen <mikk.andresen@gmail.com>
Date: Fri, 5 May 2017 10:28:44 +0300
Subject: [PATCH] Use different cookie name for different protocols -
 https://github.com/ether/etherpad-lite/issues/3179

---
 src/static/js/pad_cookie.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad_cookie.js b/src/static/js/pad_cookie.js
index b563a7e60..72eb3fe95 100644
--- a/src/static/js/pad_cookie.js
+++ b/src/static/js/pad_cookie.js
@@ -23,6 +23,8 @@
 
 var padcookie = (function()
 {
+  var cookieName = isHttpsScheme() ? "prefs" : "prefsHttp";
+
   function getRawCookie()
   {
     // returns null if can't get cookie text
@@ -31,7 +33,7 @@ var padcookie = (function()
       return null;
     }
     // look for (start of string OR semicolon) followed by whitespace followed by prefs=(something);
-    var regexResult = document.cookie.match(/(?:^|;)\s*prefs=([^;]*)(?:;|$)/);
+    var regexResult = document.cookie.match(new RegExp("(?:^|;)\s*" + cookieName + "=([^;]*)(?:;|$)"));
     if ((!regexResult) || (!regexResult[1]))
     {
       return null;
@@ -44,7 +46,7 @@ var padcookie = (function()
     var expiresDate = new Date();
     expiresDate.setFullYear(3000);
     var secure = isHttpsScheme() ? ";secure" : "";
-    document.cookie = ('prefs=' + safeText + ';expires=' + expiresDate.toGMTString() + secure);
+    document.cookie = (cookieName + "=" + safeText + ";expires=" + expiresDate.toGMTString() + secure);
   }
 
   function parseCookie(text)