Backport of r145727

svn path=/branches/mono-2-6/mcs/; revision=145728
mono · Nov 9, 2009 · a53f1b8 · a53f1b8
1 parent 6c93b0c
commit a53f1b8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-09  Marek Habersack  <mhabersack@novell.com>
+
+	* HttpCookieCollection.cs: Add allows for duplicate cookie
+	names. Fixes bug #553150
+
 2009-10-30  Marek Habersack  <mhabersack@novell.com>
 
 	* HttpRequest.cs: added internal property ClientFilePath, which

diff --git a/mcs/class/System.Web/System.Web/HttpCookieCollection.cs b/mcs/class/System.Web/System.Web/HttpCookieCollection.cs
@@ -92,9 +92,6 @@ public HttpCookieCollection ()
 
 		public void Add (HttpCookie cookie)
 		{
-			if (BaseGet (cookie.Name) != null)
-				return;
-
 			BaseAdd (cookie.Name, cookie);
 		}
 

diff --git a/mcs/class/System.Web/Test/System.Web/ChangeLog b/mcs/class/System.Web/Test/System.Web/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-09  Marek Habersack  <mhabersack@novell.com>
+
+	* HttpCookieCollectionTest.cs: added test for bug #553150
+
 2009-09-07  Marek Habersack  <mhabersack@novell.com>
 
 	* XmlSiteMapProviderTest.cs: added

diff --git a/mcs/class/System.Web/Test/System.Web/HttpCookieCollectionTest.cs b/mcs/class/System.Web/Test/System.Web/HttpCookieCollectionTest.cs
@@ -64,6 +64,19 @@ public void DuplicateNames ()
 
 			col.Set (cookie2);
 			Assert.AreEqual ("value2", col["cookie"].Value, "set should use last used cookie");
+
+			col.Clear ();
+			col.Add (cookie1);
+			col.Add (cookie2);
+
+			// Bug #553150
+			HttpCookie tmp = col.Get (0);
+			Assert.AreEqual ("cookie", tmp.Name, "#A1");
+			Assert.AreEqual ("value1", tmp.Value, "#A1-1");
+
+			tmp = col.Get (1);
+			Assert.AreEqual ("cookie", tmp.Name, "#A2");
+			Assert.AreEqual ("value2", tmp.Value, "#A2-1");
 		}
 
 		[Test]