Merge branch 'v2.2' into v2.3

Conflicts: src/version.txt
DotNetOpenAuth · Aug 20, 2008 · be74691 · be74691
2 parents 8d20fc7 + 18e0f89
commit be74691
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/build.proj b/build.proj
@@ -84,7 +84,6 @@
 		     where CallTarget is fired do NOT affect those called targets. -->
 		<PropertyGroup>
 			<Sign>true</Sign>
-			<Configuration Condition=" '$(ConfigurationAutoSet)' == 'true' ">Release</Configuration>
 		</PropertyGroup>
 	</Target>
 

diff --git a/samples/ProviderPortal/.gitignore b/samples/ProviderPortal/.gitignore
@@ -1,4 +1,4 @@
 Bin
 obj
 *.user
-*Trace.txt
+*.log
diff --git a/samples/ProviderPortal/Site.Master b/samples/ProviderPortal/Site.Master
@@ -4,13 +4,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
 	<title>OpenID Provider, by DotNetOpenId</title>
-	<link href="styles.css" rel="stylesheet" type="text/css" />
+	<link href="/styles.css" rel="stylesheet" type="text/css" />
 	<asp:ContentPlaceHolder ID="head" runat="server" />
 </head>
 <body>
 	<form id="form1" runat="server">
 	<div><a href="http://dotnetopenid.googlecode.com">
-		<img runat="server" src="~/images/dotnetopenid_tiny.gif" title="Jump to the project web site."
+		<img runat="server" src="/images/dotnetopenid_tiny.gif" title="Jump to the project web site."
 			alt="DotNetOpenId" border='0' /></a> </div>
 	<div>
 		<asp:ContentPlaceHolder ID="Main" runat="server" />

diff --git a/samples/RelyingPartyPortal/.gitignore b/samples/RelyingPartyPortal/.gitignore
@@ -1,4 +1,4 @@
 Bin
 obj
-*Trace.txt
 *.user
+*.log
diff --git a/src/DotNetOpenId.Test/Properties/AssemblyInfo.cs b/src/DotNetOpenId.Test/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DotNetOpenId.Test")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyCopyright("Copyright © 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/src/DotNetOpenId/Properties/AssemblyInfo.cs b/src/DotNetOpenId/Properties/AssemblyInfo.cs
@@ -34,7 +34,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DotNetOpenId")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyCopyright("Copyright ©  2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en-US")]

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdRelyingParty.cs b/src/DotNetOpenId/RelyingParty/OpenIdRelyingParty.cs
@@ -190,6 +190,13 @@ public OpenIdRelyingParty()
 
 			// Build the return_to URL
 			UriBuilder returnTo = new UriBuilder(Util.GetRequestUrlFromContext());
+			// Normalize the portion of the return_to path that correlates to the realm for capitalization.
+			// (so that if a web app base path is /MyApp/, but the URL of this request happens to be
+			// /myapp/login.aspx, we bump up the return_to Url to use /MyApp/ so it matches the realm.
+			if (returnTo.Path.StartsWith(realm.AbsolutePath, StringComparison.OrdinalIgnoreCase) &&
+				!returnTo.Path.StartsWith(realm.AbsolutePath, StringComparison.Ordinal)) {
+				returnTo.Path = realm.AbsolutePath + returnTo.Path.Substring(realm.AbsolutePath.Length);
+			}
 			// Trim off any parameters with an "openid." prefix, and a few known others
 			// to avoid carrying state from a prior login attempt.
 			returnTo.Query = string.Empty;