Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Net.Http/Test/System.Net.Http.Headers/ContentDispositionHeaderValueTest.cs

@@ -223,6 +223,14 @@ namespace MonoTests.System.Net.Http.Headers
 			value.FileName = "\"quoted\"";
 			Assert.AreEqual ("\"quoted\"", value.FileName, "#41");
 			Assert.AreEqual (new NameValueHeaderValue ("filename", "\"quoted\""), value.Parameters.First (), "#42");
+
+			value.FileName = "~";
+			Assert.AreEqual ("~", value.FileName, "#51");
+			Assert.AreEqual (new NameValueHeaderValue ("filename", "~"), value.Parameters.First (), "#52");
+
+			value.FileName = "\x7f";
+			Assert.AreEqual ("\"\x7f\"", value.FileName, "#61");
+			Assert.AreEqual (new NameValueHeaderValue ("filename", "\"\x7f\""), value.Parameters.First (), "#62");
 		}
 
 		[Test]

mcs/class/System.Net.Http/Test/System.Net.Http.Headers/ContentRangeHeaderValueTest.cs

@@ -84,11 +84,11 @@ namespace MonoTests.System.Net.Http.Headers
 		[Test]
 		public void Parse ()
 		{
-			var res = ContentRangeHeaderValue.Parse ("bytes  0 - 499/ 1234");
+			var res = ContentRangeHeaderValue.Parse ("bytes  0 - 499/ 9223372036854775807");
 			Assert.AreEqual (0, res.From, "#1");
 			Assert.AreEqual (499, res.To, "#2");
-			Assert.AreEqual (1234, res.Length, "#3");
-			Assert.AreEqual ("bytes 0-499/1234", res.ToString (), "#4");
+			Assert.AreEqual (9223372036854775807, res.Length, "#3");
+			Assert.AreEqual ("bytes 0-499/9223372036854775807", res.ToString (), "#4");
 
 			res = ContentRangeHeaderValue.Parse ("bytes  */ 8");
 			Assert.IsNull (res.From, "#11");

mcs/class/System.Net.Http/Test/System.Net.Http.Headers/NameValueHeaderValueTest.cs

@@ -51,6 +51,30 @@ namespace MonoTests.System.Net.Http.Headers
 				Assert.Fail ("#2");
 			} catch (FormatException) {
 			}
+
+			try {
+				new NameValueHeaderValue ("\x7f", null);
+				Assert.Fail ("#3");
+			} catch (FormatException) {
+			}
+
+			try {
+				new NameValueHeaderValue ("arg", "\x7f");
+				Assert.Fail ("#4");
+			} catch (FormatException) {
+			}
+		}
+
+		[Test]
+		public void Ctor_ValidArguments ()
+		{
+			NameValueHeaderValue nvh;
+			
+			nvh = new NameValueHeaderValue ("arg", "~");
+			Assert.AreEqual ("~", nvh.Value, "#1");
+			
+			nvh = new NameValueHeaderValue ("arg", "\"\x7f\x80\"");
+			Assert.AreEqual ("\"\x7f\x80\"", nvh.Value, "#2");
 		}
 
 		[Test]

mcs/class/System.Net.Http/Test/System.Net.Http.Headers/RangeHeaderValueTest.cs

@@ -116,6 +116,12 @@ namespace MonoTests.System.Net.Http.Headers
 			Assert.IsNull (res.Ranges.Skip (1).First ().From, "#53");
 			Assert.AreEqual (9, res.Ranges.Skip (1).First ().To, "#54");
 			Assert.AreEqual ("bytes=0-, -9", res.ToString (), "#55");
+
+			res = RangeHeaderValue.Parse ("bytes=3637717541-9223372036854775807");
+			Assert.AreEqual ("bytes", res.Unit, "#60");
+			Assert.AreEqual (3637717541, res.Ranges.First ().From, "#61");
+			Assert.AreEqual (9223372036854775807, res.Ranges.First ().To, "#62");
+			Assert.AreEqual ("bytes=3637717541-9223372036854775807", res.ToString (), "#63");
 		}
 
 		[Test]

mcs/class/System.Net.Http/Test/System.Net.Http.Headers/ViaHeaderValueTest.cs

@@ -101,12 +101,12 @@ namespace MonoTests.System.Net.Http.Headers
 			Assert.AreEqual ("1.1", res.ProtocolVersion, "#3");
 			Assert.AreEqual ("1.1 nowhere.com", res.ToString (), "#4");
 
-			res = ViaHeaderValue.Parse ("foo / 1.1 nowhere.com:43   ( lalala ) ");
+			res = ViaHeaderValue.Parse ("foo / 1.1 nowhere.com:43   ( lal ( a ) la ) ");
 			Assert.AreEqual ("foo", res.ProtocolName, "#10");
 			Assert.AreEqual ("1.1", res.ProtocolVersion, "#11");
 			Assert.AreEqual ("nowhere.com:43", res.ReceivedBy, "#12");
-			Assert.AreEqual ("( lalala )", res.Comment, "#13");
-			Assert.AreEqual ("foo/1.1 nowhere.com:43 ( lalala )", res.ToString (), "#14");
+			Assert.AreEqual ("( lal ( a ) la )", res.Comment, "#13");
+			Assert.AreEqual ("foo/1.1 nowhere.com:43 ( lal ( a ) la )", res.ToString (), "#14");
 		}
 
 		[Test]