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 2 Packages Projects Releases Wiki Activity

#20935: Fix when 404 with SecureSocketsLayer module

Browse Source 
Work Item: 20935
This commit is contained in:
Jeff
2015-02-01 14:49:21 +01:00
committed by agriffard
parent 522f980fe0
commit fbbca1b921
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,41 +213,37 @@ namespace Orchard.SecureSocketsLayer.Services {
private string MakeInsecure(string path) {
var settings = GetSettings();
if (settings == null) return path;
var builder = new UriBuilder {
Scheme = Uri.UriSchemeHttp,
var insecureHostName = settings.InsecureHostName;
var builder = new UriBuilder(insecureHostName.Trim('/') + path) {
Scheme = Uri.UriSchemeHttp,
Port = 80
};
var insecureHostName = settings.InsecureHostName;
SetHost(insecureHostName, builder);
builder.Path = path;
SetPort(insecureHostName, builder);
return builder.Uri.ToString();
}
private string MakeSecure(string path) {
var settings = GetSettings();
if (settings == null) return path;
var builder = new UriBuilder {
Scheme = Uri.UriSchemeHttps,
var secureHostName = settings.SecureHostName;
var builder = new UriBuilder(secureHostName.Trim('/') + path) {
Scheme = Uri.UriSchemeHttps,
Port = 443
};
var secureHostName = settings.SecureHostName;
SetHost(secureHostName, builder);
builder.Path = path;
SetPort(secureHostName, builder);
return builder.Uri.ToString();
}
private static void SetHost(string hostName, UriBuilder builder) {
private static void SetPort(string hostName, UriBuilder builder) {
if (string.IsNullOrWhiteSpace(hostName)) return;
var splitSecuredHostName = hostName.Split(new[] {':'}, StringSplitOptions.RemoveEmptyEntries);
var splitSecuredHostName = hostName.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
if (splitSecuredHostName.Length == 2) {
int port;
if (int.TryParse(splitSecuredHostName[1], NumberStyles.Integer, CultureInfo.InvariantCulture,
out port)) {
builder.Port = port;
hostName = splitSecuredHostName[0];
}
}
builder.Host = hostName;
}
}
}