Backport of r142934

svn path=/branches/mono-2-6/mcs/; revision=142935
whitelynx · Sep 29, 2009 · 43e34e9 · 43e34e9
1 parent 69154db
commit 43e34e9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-29  Marek Habersack  <mhabersack@novell.com>
+
+	* HttpResponse.cs: use full url in redirect if
+	UseFullyQualifiedRedirectUrl is set to true in httpRuntime
+	configuration section. Patch from Brett Kiefer
+	<brett@fogcreek.com>, thanks! Fixes bug #542846
+
 2009-09-29 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
 	* HttpContext.cs: try to load App_GlobalResouces.dll if it has not

diff --git a/mcs/class/System.Web/System.Web/HttpResponse.cs b/mcs/class/System.Web/System.Web/HttpResponse.cs
@@ -881,6 +881,17 @@ public void Redirect (string url, bool endResponse)
 
 			StatusCode = 302;
 			url = ApplyAppPathModifier (url);
+#if NET_2_0
+			HttpRuntimeSection config = WebConfigurationManager.GetWebApplicationSection ("system.web/httpRuntime") as HttpRuntimeSection;
+			if (config != null && config.UseFullyQualifiedRedirectUrl) {
+				var ub = new UriBuilder (context.Request.Url);
+				ub.Fragment = null;
+				ub.Password = null;
+				ub.Query = null;
+				ub.UserName = null;
+				url = ub.Uri.ToString ();
+			}
+#endif
 			redirect_location = url;
 
 			// Text for browsers that can't handle location header