Don't overwrite previous cookies (bug #539)

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 928f01a1b6d409fa320fc899de26117ba008a2ef..d8383e4de0fec9f2e462f2655ff35eeab5313c5f 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -481,8 +481,8 @@ function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
                . ($lifetime ? "; expires=" . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT" : "")
                . "; path=" . preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"])
                . ($HTTPS ? "; secure" : "")
-               . "; HttpOnly; SameSite=lax"
-       );
+               . "; HttpOnly; SameSite=lax",
+               false);
 }
 
 /** Restart stopped session

diff --git a/changes.txt b/changes.txt
index ffbd04c2273fdeaaceec3654eb9c3d1949fb7dc2..40c2a8d93af43000c7682cdda0aded167f0cf16c 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 4.3.1-dev:
+Fix permanent logging after logout (bug #539)
 PostgreSQL: Fix index size computation in PostgreSQL < 9.0 (regression from 4.3.0)
 PostgreSQL: Fix nullable fields in export
 PostgreSQL: Support JSON and JSONB data types