From b37306e3e76e168640fbc2371bb802454670d524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Tue, 24 Sep 2019 14:45:56 +0200
Subject: [PATCH] bugfix: Fix warning persisting in logs
This (finally!) resolves #1176
---
lib/SimpleSAML/SessionHandlerPHP.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 280584f70..f2ccb8ded 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -67,10 +67,11 @@ class SessionHandlerPHP extends SessionHandler
session_write_close();
}
- if (!empty($this->cookie_name)) {
- session_name($this->cookie_name);
- } else {
+
+ if (empty($this->cookie_name)) {
$this->cookie_name = session_name();
+ } elseif (!headers_sent() || version_compare(PHP_VERSION, '7.2', '<')) {
+ session_name($this->cookie_name);
}
$params = $this->getCookieParams();
--
GitLab