Author: gonzalo
Date: 2005-04-01 19:27:36 -0500 (Fri, 01 Apr 2005)
New Revision: 42486

Modified:
   trunk/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs
   trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog
Log:
2005-04-01 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>

        * CachedVaryBy.cs: fixed VaryByParam and wildcard (*). Patch by Ilya
        Kharmatsky (Mainsoft) that fixes bug #73981.



Modified: trunk/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs       
2005-04-01 23:49:28 UTC (rev 42485)
+++ trunk/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs       
2005-04-02 00:27:36 UTC (rev 42486)
@@ -42,6 +42,7 @@
                private string custom;
                private string key;
                private ArrayList item_list;
+               private bool wildCardParams;
                
                internal CachedVaryBy (HttpCachePolicy policy, string key)
                {
@@ -50,6 +51,7 @@
                        custom = policy.GetVaryByCustom ();
                        this.key = key;
                        item_list = new ArrayList ();
+                       wildCardParams = policy.VaryByParams ["*"];
                }
 
                internal ArrayList ItemList {
@@ -82,6 +84,14 @@
                                        builder.Append (request.Params [prms 
[i]]);
                                        builder.Append ('\n');
                                }
+                       } else if (wildCardParams) {
+                               foreach (string p in request.Params) {
+                                       builder.Append ("VP:");
+                                       builder.Append (p);
+                                       builder.Append ('=');
+                                       builder.Append (request.Params [p]);
+                                       builder.Append ('\n');
+                               }
                        }
                        
                        if (headers != null) {

Modified: trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog     2005-04-01 
23:49:28 UTC (rev 42485)
+++ trunk/mcs/class/System.Web/System.Web.Caching/ChangeLog     2005-04-02 
00:27:36 UTC (rev 42486)
@@ -1,3 +1,8 @@
+2005-04-01 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+       * CachedVaryBy.cs: fixed VaryByParam and wildcard (*). Patch by Ilya
+       Kharmatsky (Mainsoft) that fixes bug #73981.
+
 2005-04-01  Lluis Sanchez Gual <[EMAIL PROTECTED]>
 
        * CachedRawResponse.cs: Fix warning.

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to