From 8ccb6e2e2f13abe76eee25577f4dd7f7990a3ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Fri, 2 Feb 2018 13:26:08 +0100
Subject: [PATCH] Merge $params with cookie params config only when needed.
---
lib/SimpleSAML/Session.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index a69327667..50e6ad9e9 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -753,18 +753,16 @@ class SimpleSAML_Session implements Serializable
*/
public function updateSessionCookies($params = null)
{
- $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
+ assert(is_null($params) || is_array($params));
- if (is_array($params) && !empty($params)) {
- $params = array_merge($sessionHandler->getCookieParams(), $params);
- } else {
- $params = $sessionHandler->getCookieParams();
- }
+ $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
if ($this->sessionId !== null) {
$sessionHandler->setCookie($sessionHandler->getSessionCookieName(), $this->sessionId, $params);
}
+ $params = array_merge($sessionHandler->getCookieParams(), is_array($params) ? $params : array());
+
if ($this->authToken !== null) {
$globalConfig = SimpleSAML_Configuration::getInstance();
\SimpleSAML\Utils\HTTP::setCookie(
--
GitLab