From cb8cd888c0b0f9cc258ef3dbb21fbf4b3392413f Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 17 Nov 2011 12:12:20 +0000
Subject: [PATCH] Utilities: Fix absolute URL in baseurlpath.
A bug in the 'baseurlpath' parsing meant that 'https://example.org/'
was not considered a valid value for 'baseurlpath'.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2984 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Utilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index f68ab1e5f..78be4eeed 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -212,7 +212,7 @@ class SimpleSAML_Utilities {
$globalConfig = SimpleSAML_Configuration::getInstance();
$baseURL = $globalConfig->getString('baseurlpath', 'simplesaml/');
- if (preg_match('#^https?://([^/]*)/(.*)/$#D', $baseURL, $matches)) {
+ if (preg_match('#^https?://.*/$#D', $baseURL, $matches)) {
/* full url in baseurlpath, override local server values */
return $baseURL;
} elseif (
--
GitLab