From 668287793d544639a8b335bb6a4eb7eca9776be2 Mon Sep 17 00:00:00 2001
From: Jan Trejbal <jan.trejbal@scalesoft.cz>
Date: Wed, 28 Mar 2018 18:29:50 +0200
Subject: [PATCH] Fix tests for PHP 7.2
---
lib/SimpleSAML/SessionHandlerPHP.php | 16 +++++++++-------
modules/saml/lib/IdP/SAML2.php | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 350b0e43b..30f3d909a 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -76,13 +76,15 @@ class SessionHandlerPHP extends SessionHandler
$params = $this->getCookieParams();
- session_set_cookie_params(
- $params['lifetime'],
- $params['path'],
- $params['domain'],
- $params['secure'],
- $params['httponly']
- );
+ if (!headers_sent()) {
+ session_set_cookie_params(
+ $params['lifetime'],
+ $params['path'],
+ $params['domain'],
+ $params['secure'],
+ $params['httponly']
+ );
+ }
$savepath = $config->getString('session.phpsession.savepath', null);
if (!empty($savepath)) {
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/lib/IdP/SAML2.php
index 30d95781d..9c6860585 100644
--- a/modules/saml/lib/IdP/SAML2.php
+++ b/modules/saml/lib/IdP/SAML2.php
@@ -443,7 +443,7 @@ class sspmod_saml_IdP_SAML2
public static function processSOAPAuthnRequest(array &$state)
{
if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) {
- SimpleSAML_Logger::error("ECP AuthnRequest did not contain Basic Authentication header");
+ SimpleSAML\Logger::error("ECP AuthnRequest did not contain Basic Authentication header");
// TODO Throw some sort of ECP-specific exception / convert this to SOAP fault
throw new SimpleSAML_Error_Error("WRONGUSERPASS");
}
--
GitLab