Skip to content
Snippets Groups Projects
Commit cb8cd888 authored by Olav Morken's avatar Olav Morken
Browse files

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
parent 999042e7
Branches
Tags
No related merge requests found
......@@ -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 (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment