From 3ad8a9f2680d6d9cb561c90508ab8ae8bac3c227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez?= <jaime.perez@uninett.no>
Date: Sun, 3 Jul 2016 00:10:29 +0200
Subject: [PATCH] Revert "Set the session name explicitly in SessionHandlerPHP,
even when we are using the default value."
This reverts commit cd6278cc2bf0704d130aa2fe66e8b6dc1d007375.
---
lib/SimpleSAML/SessionHandlerPHP.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 8f6ee835f..198ea6a65 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', ini_get('session.name'));
+ $this->cookie_name = $config->getString('session.phpsession.cookiename', null);
if (function_exists('session_status') && defined('PHP_SESSION_ACTIVE')) { // PHP >= 5.4
$previous_session = session_status() === PHP_SESSION_ACTIVE;
@@ -61,7 +61,11 @@ class SimpleSAML_SessionHandlerPHP extends SimpleSAML_SessionHandler
session_write_close();
}
- session_name($this->cookie_name);
+ if (!empty($this->cookie_name)) {
+ session_name($this->cookie_name);
+ } else {
+ $this->cookie_name = session_name();
+ }
$params = $this->getCookieParams();
--
GitLab