summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaime Pérez <jaime.perez@uninett.no>2016-07-25 12:44:46 +0200
committerJaime Pérez <jaime.perez@uninett.no>2016-07-25 12:44:46 +0200
commitde8c1d24fdb2448f394023abc37f0aa05ff5e44f (patch)
tree707b1ed82bd7205fb70120a91b8026f6c6890851
parent1ed245c49d2c4563fd7b7108c98d4c719059a284 (diff)
downloadsimplesamlphp-de8c1d24fdb2448f394023abc37f0aa05ff5e44f.zip
simplesamlphp-de8c1d24fdb2448f394023abc37f0aa05ff5e44f.tar.gz
simplesamlphp-de8c1d24fdb2448f394023abc37f0aa05ff5e44f.tar.bz2
bugfix: Critical configuration errors should not enforce a baseurlpath.
The code was enforcing this option even if a configuration was passed as a parameter to the constructor. If there is something wrong with a configuration and we are passing it to the constructor, we should know if at least the 'baseurlpath' is correct, and if not, fix it somehow. This bug was producing a default configuration without 'baseurlpath', when no configuration was passed. In that situation, only the default path (/simplesaml) was working correctly.
-rw-r--r--lib/SimpleSAML/Error/CriticalConfigurationError.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/SimpleSAML/Error/CriticalConfigurationError.php b/lib/SimpleSAML/Error/CriticalConfigurationError.php
index 3d036f7..76af87f 100644
--- a/lib/SimpleSAML/Error/CriticalConfigurationError.php
+++ b/lib/SimpleSAML/Error/CriticalConfigurationError.php
@@ -48,7 +48,6 @@ class CriticalConfigurationError extends ConfigurationError
{
if ($config === null) {
$config = self::$minimum_config;
- } else {
$config['baseurlpath'] = \SimpleSAML\Utils\HTTP::guessBasePath();
}