From cd6278cc2bf0704d130aa2fe66e8b6dc1d007375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez?= <jaime.perez@uninett.no>
Date: Sat, 2 Jul 2016 18:27:01 +0200
Subject: [PATCH] Set the session name explicitly in SessionHandlerPHP, even
when we are using the default value.
---
lib/SimpleSAML/SessionHandlerPHP.php | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 6907938a0..6f952b39e 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -42,7 +42,7 @@ class SimpleSAML_SessionHandlerPHP extends SimpleSAML_SessionHandler
parent::__construct();
$config = SimpleSAML_Configuration::getInstance();
- $this->cookie_name = $config->getString('session.phpsession.cookiename', null);
+ $this->cookie_name = $config->getString('session.phpsession.cookiename', ini_get('session.name'));
if (function_exists('session_status') && defined('PHP_SESSION_ACTIVE')) { // PHP >= 5.4
$previous_session = session_status() === PHP_SESSION_ACTIVE;
@@ -61,11 +61,7 @@ class SimpleSAML_SessionHandlerPHP extends SimpleSAML_SessionHandler
session_write_close();
}
- if (!empty($this->cookie_name)) {
- session_name($this->cookie_name);
- } else {
- $this->cookie_name = session_name();
- }
+ session_name($this->cookie_name);
$params = $this->getCookieParams();
--
GitLab