Imported Upstream version 4.0.1

Former-commit-id: 6d37e02debfe41dd5c13ba6f6a2428c8b1ff5e28
This commit is contained in:
Jo Shields
2015-04-26 19:10:23 +01:00
parent 3c1f479b9d
commit 7272927785
252 changed files with 16715 additions and 1176 deletions

View File

@ -350,10 +350,17 @@ namespace System.Net.Http.Headers
sb.Append (entry.Key);
sb.Append (": ");
string separator = ",";
HeaderInfo headerInfo;
if (known_headers.TryGetValue (entry.Key, out headerInfo) && headerInfo.AllowsMany)
separator = headerInfo.Separator;
bool first = true;
foreach (var v in entry.Value) {
if (!first)
sb.Append (", ");
if (!first) {
sb.Append (separator);
sb.Append (" ");
}
sb.Append (v);
first = false;

View File

@ -147,5 +147,13 @@ namespace MonoTests.System.Net.Http.Headers
Assert.AreEqual ("aa: v, v\r\nx: v\r\n", headers.ToString ());
}
[Test]
public void ToString_DifferentSeparator ()
{
headers.Add ("User-Agent", "MyApp/1.0.0.0 (iOS; 7.1.2; fr_FR) (Apple; iPhone3,1)");
Assert.AreEqual ("User-Agent: MyApp/1.0.0.0 (iOS; 7.1.2; fr_FR) (Apple; iPhone3,1)\r\n", headers.ToString ());
}
}
}