lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5202 from jtkech/patch-3

Browse Source 
#5113: SecureSocketsLayer, incorrect Hostname when port number is included
This commit is contained in:
Sébastien Ros
2015-04-30 12:33:48 -07:00
parent f2f9d8c1ca 6615ea961e
commit 1a9be8c57a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs
View File

@@ -214,7 +214,7 @@ namespace Orchard.SecureSocketsLayer.Services {
var settings = GetSettings();
if (settings == null) return path;
var insecureHostName = settings.InsecureHostName;
var builder = new UriBuilder(insecureHostName.Trim('/') + path) {
var builder = new UriBuilder(insecureHostName.Split(':').First().Trim('/') + path) {
Scheme = Uri.UriSchemeHttp,
Port = 80
};
@@ -226,7 +226,7 @@ namespace Orchard.SecureSocketsLayer.Services {
var settings = GetSettings();
if (settings == null) return path;
var secureHostName = settings.SecureHostName;
var builder = new UriBuilder(secureHostName.Trim('/') + path) {
var builder = new UriBuilder(secureHostName.Split(':').First().Trim('/') + path) {
Scheme = Uri.UriSchemeHttps,
Port = 443
};
@@ -246,4 +246,4 @@ namespace Orchard.SecureSocketsLayer.Services {
}
}
}
}
}