Author: gonzalo
Date: 2005-04-01 19:29:07 -0500 (Fri, 01 Apr 2005)
New Revision: 42487

Modified:
   branches/mono-1-0/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs
   branches/mono-1-0/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).



Modified: 
branches/mono-1-0/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs
===================================================================
--- branches/mono-1-0/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs   
2005-04-02 00:27:36 UTC (rev 42486)
+++ branches/mono-1-0/mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs   
2005-04-02 00:29:07 UTC (rev 42487)
@@ -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: branches/mono-1-0/mcs/class/System.Web/System.Web.Caching/ChangeLog
===================================================================
--- branches/mono-1-0/mcs/class/System.Web/System.Web.Caching/ChangeLog 
2005-04-02 00:27:36 UTC (rev 42486)
+++ branches/mono-1-0/mcs/class/System.Web/System.Web.Caching/ChangeLog 
2005-04-02 00:29:07 UTC (rev 42487)
@@ -1,3 +1,8 @@
+2005-04-01 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+       * CachedVaryBy.cs: fixed VaryByParam and wildcard (*). Patch by Ilya
+       Kharmatsky (Mainsoft).
+
 2004-11-08 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
 
        * CacheEntry.cs: convert the external DateTime to GMT, as everything

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

Reply via email to