diff options
| author | Jaime Perez Crespo <jaime.perez@uninett.no> | 2016-03-03 11:48:54 +0100 |
|---|---|---|
| committer | Jaime Perez Crespo <jaime.perez@uninett.no> | 2016-03-03 11:48:54 +0100 |
| commit | d4de56da714ffc46cfee0b066c723c21be527c79 (patch) | |
| tree | f79bb33b6e580868fb071da5915f7da0edcab9ec /lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php | |
| parent | 7ce18d59c208fb28baaef549280d09bf9b9dc903 (diff) | |
| download | simplesamlphp-d4de56da714ffc46cfee0b066c723c21be527c79.zip simplesamlphp-d4de56da714ffc46cfee0b066c723c21be527c79.tar.gz simplesamlphp-d4de56da714ffc46cfee0b066c723c21be527c79.tar.bz2 | |
Rename Utils\HTTP::getSelfHostWithoutPort() to Utils\HTTP::getSelfHostWithNonStandardPort(), change the logic, and reimplement Utils\HTTP::getSelfHost() to depend on use the former. Complete the tests to include the case of port 443 while using HTTPS.
Diffstat (limited to 'lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php')
| -rw-r--r-- | lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php index 80bade1..3f86322 100644 --- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php +++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php @@ -134,9 +134,9 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile extends SimpleSAML_Meta } elseif ($set === 'shib13-idp-hosted') { return $baseurl.'shib13/idp/metadata.php'; } elseif ($set === 'wsfed-sp-hosted') { - return 'urn:federation:'.\SimpleSAML\Utils\HTTP::getSelfHostWithoutPort(); + return 'urn:federation:'.\SimpleSAML\Utils\HTTP::getSelfHost(); } elseif ($set === 'adfs-idp-hosted') { - return 'urn:federation:'.\SimpleSAML\Utils\HTTP::getSelfHostWithoutPort().':idp'; + return 'urn:federation:'.\SimpleSAML\Utils\HTTP::getSelfHost().':idp'; } else { throw new Exception('Can not generate dynamic EntityID for metadata of this type: ['.$set.']'); } |