summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-06-16 06:37:27 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2010-06-16 06:37:27 -0700
commit48a66cc2457ce2915f26d73bcb984ef649a6804f (patch)
tree1c45bec6d0c89e80141b451a2bab219672689b17
parent07ca685b321e9bbc4ee3db6f367431f38ef5f994 (diff)
downloadDotNetOpenAuth-48a66cc2457ce2915f26d73bcb984ef649a6804f.zip
DotNetOpenAuth-48a66cc2457ce2915f26d73bcb984ef649a6804f.tar.gz
DotNetOpenAuth-48a66cc2457ce2915f26d73bcb984ef649a6804f.tar.bz2
Corrected regression caused by 07ca685b321e.
-rw-r--r--src/DotNetOpenAuth/OpenId/UriIdentifier.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/DotNetOpenAuth/OpenId/UriIdentifier.cs b/src/DotNetOpenAuth/OpenId/UriIdentifier.cs
index 7bd7dae..f5ecd4f 100644
--- a/src/DotNetOpenAuth/OpenId/UriIdentifier.cs
+++ b/src/DotNetOpenAuth/OpenId/UriIdentifier.cs
@@ -418,6 +418,9 @@ namespace DotNetOpenAuth.OpenId {
canonicalUri = null;
try {
uri = DoSimpleCanonicalize(uri, forceHttpsDefaultScheme, out schemePrepended);
+ if (schemeSubstitution) {
+ uri = NormalSchemeToSpecialRoundTrippingScheme(uri);
+ }
// Use a UriBuilder because it helps to normalize the URL as well.
return TryCanonicalize(uri, out canonicalUri);
@@ -504,10 +507,6 @@ namespace DotNetOpenAuth.OpenId {
schemePrepended = true;
}
- if (schemeSubstitution) {
- uri = NormalSchemeToSpecialRoundTrippingScheme(uri);
- }
-
return uri;
}