Author: gonzalo
Date: 2006-11-25 12:20:52 -0500 (Sat, 25 Nov 2006)
New Revision: 68459

Modified:
   trunk/mcs/class/System.Web/System.Web/ChangeLog
   trunk/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: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog     2006-11-25 14:17:08 UTC 
(rev 68458)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog     2006-11-25 17:20:52 UTC 
(rev 68459)
@@ -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"

Modified: trunk/mcs/class/System.Web/System.Web/HttpServerUtility.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpServerUtility.cs  2006-11-25 
14:17:08 UTC (rev 68458)
+++ trunk/mcs/class/System.Web/System.Web/HttpServerUtility.cs  2006-11-25 
17:20:52 UTC (rev 68459)
@@ -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

Reply via email to