[xsp] Fix for bug #2774. RawUrl shall really be raw.

mono · Jan 10, 2012 · edb5d4e · edb5d4e
1 parent a641207
commit edb5d4e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/Mono.WebServer.Apache/ModMonoWorkerRequest.cs b/src/Mono.WebServer.Apache/ModMonoWorkerRequest.cs
@@ -4,11 +4,13 @@
 // Authors:
 //	Daniel Lopez Ridruejo
 // 	Gonzalo Paniagua Javier
+//	Marek Habersack <grendel@twistedcode.net>
 //
 // Copyright (c) 2002 Daniel Lopez Ridruejo.
 //           (c) 2002,2003 Ximian, Inc.
 //           All rights reserved.
 // (C) Copyright 2004-2008 Novell, Inc. (http://www.novell.com)
+// Copyright 2012 Xamarin, Inc (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -52,6 +54,7 @@ public class ModMonoWorkerRequest : MonoWorkerRequest
 		string protocol;
 		string path;
 		string pathInfo;
+		string rawUrl;
 		string localAddress;
 		int serverPort;
 		string remoteAddress;
@@ -137,6 +140,9 @@ static void SetDefaultIndexFiles (string list)
 			this.requestBroker = requestBroker;
 			this.verb = verb;
 			this.appHost = appHost;
+			this.rawUrl = path;
+			if (!String.IsNullOrEmpty (queryString))
+				this.rawUrl += "?" + queryString;
 			//this.protocol = protocol;
 			// Don't let System.Web know if it's 1.1. This way apache handles the chunked
 			// encoding for us, without sys.web interfering.
@@ -174,14 +180,7 @@ public override string GetPathInfo ()
 
 		public override string GetRawUrl ()
 		{
-			string result = path;
+			return rawUrl;
-			if (pathInfo != null && pathInfo.Length > 0)
-				result += pathInfo;
-
-			if (queryString != null && queryString.Length > 0)
-				return result + "?" + queryString;
-
-			return result;
 		}
 
 		bool TryDirectory ()

diff --git a/src/Mono.WebServer.XSP/XSPWorkerRequest.cs b/src/Mono.WebServer.XSP/XSPWorkerRequest.cs
@@ -4,9 +4,11 @@
 // Authors:
 //	Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //	Simon Waite (simon@psionics.demon.co.uk)
+//	Marek Habersack (grendel@twistedcode.net)
 //
 // (C) 2002,2003 Ximian, Inc (http://www.ximian.com)
 // (C) Copyright 2004-2005 Novell, Inc. (http://www.novell.com)
+// Copyright 2012 Xamarin, Inc (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -51,6 +53,7 @@ public class XSPWorkerRequest : MonoWorkerRequest
 	{
 		string verb;
 		string path;
+		string rawUrl;
 		string pathInfo;
 		string queryString;
 		string protocol;
@@ -174,6 +177,9 @@ static void SetDefaultIndexFiles (string list)
 			this.requestBroker = requestBroker;
 			this.remoteEP = remoteEP;
 			this.verb = verb;
+			this.rawUrl = path;
+			if (!String.IsNullOrEmpty (queryString))
+				this.rawUrl += "?" + queryString;
 			try {
 				Paths.GetPathsFromUri (appHost, verb, path, out this.path, out pathInfo);
 			} catch {
@@ -508,14 +514,7 @@ public override string GetQueryString ()
 
 		public override string GetRawUrl ()
 		{
-			string result = path;
+			return rawUrl;
-			if (pathInfo != null && pathInfo.Length > 0)
-				result += pathInfo;
-
-			if (queryString != null && queryString.Length > 0)
-				return result + "?" + queryString;
-
-			return result;
 		}
 
 		public override string GetRemoteAddress ()