From 86b9f12fba352644d882d9808075bc02faebd5c4 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Wed, 27 May 2015 15:43:57 +0000
Subject: [PATCH] Remove override.host config variable.
This option made it possible to override the configuration per host, but it has never been documented, and it can be replaced with simple PHP code in the configuration.
Closes #2
---
lib/SimpleSAML/Configuration.php | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index deff4a67a..e3425bace 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -107,20 +107,6 @@ class SimpleSAML_Configuration {
$config = array();
}
- if (array_key_exists('override.host', $config)) {
- $host = $_SERVER['HTTP_HOST'];
- if (array_key_exists($host, $config['override.host'])) {
- $ofs = $config['override.host'][$host];
- foreach (SimpleSAML\Utils\Arrays::arrayize($ofs) AS $of) {
- $overrideFile = dirname($filename) . '/' . $of;
- if (!file_exists($overrideFile)) {
- throw new Exception('Config file [' . $filename . '] requests override for host ' . $host . ' but file does not exists [' . $of . ']');
- }
- require($overrideFile);
- }
- }
- }
-
$cfg = new SimpleSAML_Configuration($config, $filename);
$cfg->filename = $filename;
--
GitLab