Imported Upstream version 3.2.8+dfsgupstream/3.2.8+dfsg

1 files changed, 10 insertions, 2 deletions

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpCapabilitiesBase.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpCapabilitiesBase.cs
index 99486acfd2..d37fa87d92 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpCapabilitiesBase.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpCapabilitiesBase.cs
@@ -247,9 +247,17 @@ namespace System.Web.Configuration
 			}
 		}
 
-		public IDictionary Capabilities {
+		public IDictionary Capabilities
+		{
 			get { return capabilities; }
-			set { capabilities = new Hashtable(value, StringComparer.OrdinalIgnoreCase); }
+			set {
+				//value comes with duplicated keys, so we filter them out
+				capabilities = new Hashtable (value.Keys.Count, StringComparer.OrdinalIgnoreCase);
+				foreach (object key in value.Keys) {
+					if (!capabilities.Contains (key))
+						capabilities.Add (key, value [key]);
+				}
+			}
 		}
 
 		int defaultSubmitButtonLimit;