diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2013-04-11 22:53:35 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2013-04-11 22:53:35 -0700 |
| commit | 2feb70bbb0c47a95a6edf68c492b4c2c7d2266bb (patch) | |
| tree | 472a4b5c61b5250f8b4cbc291a619361a780a261 /src/DotNetOpenAuth.Core/Messaging | |
| parent | e6398df1dc2d5a9d1c50d08dd29da71dbc5eb623 (diff) | |
| parent | 778328ec797299ed6aa01279b3ccbf1eb15258bd (diff) | |
| download | DotNetOpenAuth-2feb70bbb0c47a95a6edf68c492b4c2c7d2266bb.zip DotNetOpenAuth-2feb70bbb0c47a95a6edf68c492b4c2c7d2266bb.tar.gz DotNetOpenAuth-2feb70bbb0c47a95a6edf68c492b4c2c7d2266bb.tar.bz2 | |
Merge branch 'v4.1' into v4.2
Conflicts:
src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
Diffstat (limited to 'src/DotNetOpenAuth.Core/Messaging')
| -rw-r--r-- | src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs index e859162..80703c1 100644 --- a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs +++ b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs @@ -399,7 +399,8 @@ namespace DotNetOpenAuth.Messaging { // the public URL: if (serverVariables["HTTP_HOST"] != null) { ErrorUtilities.VerifySupported(request.Url.Scheme == Uri.UriSchemeHttps || request.Url.Scheme == Uri.UriSchemeHttp, "Only HTTP and HTTPS are supported protocols."); - string scheme = serverVariables["HTTP_X_FORWARDED_PROTO"] ?? request.Url.Scheme; + string scheme = serverVariables["HTTP_X_FORWARDED_PROTO"] ?? + (string.Equals(serverVariables["HTTP_FRONT_END_HTTPS"], "on", StringComparison.OrdinalIgnoreCase) ? Uri.UriSchemeHttps : request.Url.Scheme); Uri hostAndPort = new Uri(scheme + Uri.SchemeDelimiter + serverVariables["HTTP_HOST"]); UriBuilder publicRequestUri = new UriBuilder(request.Url); publicRequestUri.Scheme = scheme; |