2006-11-25 Gonzalo Paniagua Javier <[email protected]>

	* HttpServerUtility.cs: don't prepend extra '?' when the original url
	already has a query string. Fixes bug #80042.


svn path=/trunk/mcs/; revision=68459

mcs/class/System.Web/System.Web/ChangeLog

@@ -1,3 +1,8 @@
+2006-11-25 Gonzalo Paniagua Javier <[email protected]>
+
+	* HttpServerUtility.cs: don't prepend extra '?' when the original url
+	already has a query string. Fixes bug #80042.
+
 2006-11-24  Miguel de Icaza  <[email protected]>
 
 	* HttpApplicationFactory.cs (InitType): Also look for "Web.Config"

mcs/class/System.Web/System.Web/HttpServerUtility.cs

@@ -135,7 +135,10 @@ namespace System.Web {
 				}
 			} finally {
 				request.SetCurrentExePath (oldFilePath);
-				request.QueryStringRaw = oldQuery;
+				if (oldQuery != null && oldQuery != "" && oldQuery != request.QueryStringRaw) {
+					oldQuery = oldQuery.Substring (1); // Ignore initial '?'
+					request.QueryStringRaw = oldQuery; // which is added here.
+				}
 				response.SetTextWriter (previous);
 				if (!preserveQuery)
 					request.SetForm (oldForm);