2007-04-05 Marek Habersack <mhabersack@novell.com>

	* CapabilitiesLoader.cs: Make sure that the capability names
	(keys) are stored in lowercase.

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

diff --git a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
index 58bfe8ea1d123b65849d9b5f98abfeb1ca49fe6b..3fc8162393eb7d6a2e4d510e73c3c9ee2f934515 100644 (file)
--- a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
+++ b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
@@ -93,8 +93,8 @@ namespace System.Web
                        if (data ["browser"] != null) { // Last one (most derived) will win.
                                tbl ["browser"] = data ["browser"];
                        }
-                       else if (tbl ["browser"] == null) { // If none so far defined value set to Unknown
-                               tbl ["browser"] = "Unknown";
+                       else if (tbl ["browser"] == null) { // If none so far defined value set to *
+                               tbl ["browser"] = "*";
                        }
 
                        if (!tbl.ContainsKey ("browsers")) {
@@ -210,10 +210,7 @@ namespace System.Web
                        defaultCaps.Add ("aol", "False");
                        defaultCaps.Add ("backgroundsounds", "False");
                        defaultCaps.Add ("beta", "False");
-                       defaultCaps.Add ("browser", "Unknown");
-#if NET_2_0
-                       defaultCaps.Add ("browsers", new ArrayList ());
-#endif
+                       defaultCaps.Add ("browser", "*");
                        defaultCaps.Add ("cdf", "False");
                        defaultCaps.Add ("cookies", "False");
                        defaultCaps.Add ("crawler", "False");
@@ -292,7 +289,7 @@ namespace System.Web
 #endif
                                try {
                                        LoadFile (filepath);
-                               } catch (Exception) { }
+                               } catch (Exception) {}
 
                                loaded = true;
                        }
@@ -373,10 +370,15 @@ namespace System.Web
                static char [] eq = new char []{'='};
                static void ReadCapabilities (TextReader input, BrowserData data)
                {
-                       string str;
+                       string str, key;
+                       string [] keyvalue;
+                       
                        while ((str = input.ReadLine ()) != null && str.Length != 0) {
-                               string [] keyvalue = str.Split (eq, 2);
-                               data.Add (keyvalue [0], keyvalue [1]);
+                               keyvalue = str.Split (eq, 2);
+                               key = keyvalue [0].ToLower (CultureInfo.InvariantCulture).Trim ();
+                               if (key.Length == 0)
+                                       continue;
+                               data.Add (key, keyvalue [1]);
                        }
                }
        }

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index 5444cb9c11db9f4e6d1666493cee47a12d483515..dc52b7ede4bfe7b16af8498dc7a92014889cef2f 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-05  Marek Habersack  <mhabersack@novell.com>
+
+       * CapabilitiesLoader.cs: Make sure that the capability names
+       (keys) are stored in lowercase.
+
 2007-04-05 Igor Zelmanovich <igorz@mainsoft.com>
 
        * XmlSiteMapProvider.cs: