Author: miguel
Date: 2006-11-25 12:53:30 -0500 (Sat, 25 Nov 2006)
New Revision: 68462
Modified:
branches/mono-1-2-1/mcs/class/System.Web/System.Web/ChangeLog
branches/mono-1-2-1/mcs/class/System.Web/System.Web/HttpServerUtility.cs
Log:
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.
Modified: branches/mono-1-2-1/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- branches/mono-1-2-1/mcs/class/System.Web/System.Web/ChangeLog
2006-11-25 17:34:58 UTC (rev 68461)
+++ branches/mono-1-2-1/mcs/class/System.Web/System.Web/ChangeLog
2006-11-25 17:53:30 UTC (rev 68462)
@@ -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-16 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* HttpApplication.cs: don't leak the directory name for non-local
Modified:
branches/mono-1-2-1/mcs/class/System.Web/System.Web/HttpServerUtility.cs
===================================================================
--- branches/mono-1-2-1/mcs/class/System.Web/System.Web/HttpServerUtility.cs
2006-11-25 17:34:58 UTC (rev 68461)
+++ branches/mono-1-2-1/mcs/class/System.Web/System.Web/HttpServerUtility.cs
2006-11-25 17:53:30 UTC (rev 68462)
@@ -135,7 +135,10 @@
}
} 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);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
