diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php index ef2845c056e1475b2d44b1acc77cae653d110169..e326d2f40a238facae05df30bbb68ebe11113d7b 100644 --- a/lib/SimpleSAML/Utilities.php +++ b/lib/SimpleSAML/Utilities.php @@ -104,21 +104,15 @@ class SimpleSAML_Utilities { public static function selfURLNoQuery() { $selfURLhost = self::selfURLhost(); - return $selfURLhost . self::getScriptName(); - - } - - public static function getScriptName() { - $scriptname = $_SERVER['SCRIPT_NAME']; - if (preg_match('|^/.*?(/.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) { - #$scriptname = $matches[1]; + $selfURLhost .= $_SERVER['SCRIPT_NAME']; + if (isset($_SERVER['PATH_INFO'])) { + $selfURLhost .= $_SERVER['PATH_INFO']; } - if (array_key_exists('PATH_INFO', $_SERVER)) $scriptname .= $_SERVER['PATH_INFO']; - - return $scriptname; - } - + return $selfURLhost; + } + + /** * Will return sp.example.org/foo */ diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php index 8b9194452e8c754347844357016e60f6bf0f0335..7cdcbdd1bb746597f5cbe2d366adc9fc54ffc76b 100644 --- a/www/example-simple/hostnames.php +++ b/www/example-simple/hostnames.php @@ -24,7 +24,6 @@ $attributes['SERVER_PORT'] = array($_SERVER['SERVER_PORT']); $attributes['Utilities_getSelfHost()'] = array(SimpleSAML_Utilities::getSelfHost()); $attributes['Utilities_selfURLhost()'] = array(SimpleSAML_Utilities::selfURLhost()); $attributes['Utilities_selfURLNoQuery()'] = array(SimpleSAML_Utilities::selfURLNoQuery()); -$attributes['Utilities_getScriptName()'] = array(SimpleSAML_Utilities::getScriptName()); $attributes['Utilities_getSelfHostWithPath()'] = array(SimpleSAML_Utilities::getSelfHostWithPath()); $attributes['Utilities_getFirstPathElement()'] = array(SimpleSAML_Utilities::getFirstPathElement()); $attributes['Utilities_selfURL()'] = array(SimpleSAML_Utilities::selfURL());