X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem%2FTest%2FSystem.Net%2FHttpListenerRequestTest.cs;h=2066cc6a6db490128d6ecf29756286db2e776030;hb=e3685c4c9aad38851097cff877dc0fb7ed47ab10;hp=c088e4e14e2ddeb71509bbda356c4d7761d12c66;hpb=e7319b9f5826c7ea64b2973f7c319aeb3081ab7a;p=mono.git

diff --git a/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs b/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs
index c088e4e14e2..2066cc6a6db 100644
--- a/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs
@@ -30,9 +30,11 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Text;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 using NUnit.Framework;
 
@@ -149,6 +151,9 @@ namespace MonoTests.System.Net
 		}
 
 		[Test]
+#if FEATURE_NO_BSD_SOCKETS
+		[ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
 		public void HttpMethod ()
 		{
 			var port = NetworkHelpers.FindFreePort ();
@@ -163,6 +168,9 @@ namespace MonoTests.System.Net
 		}
 
 		[Test]
+#if FEATURE_NO_BSD_SOCKETS
+		[ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
 		public void HttpBasicAuthScheme ()
 		{
 			var port = NetworkHelpers.FindFreePort ();			
@@ -178,6 +186,9 @@ namespace MonoTests.System.Net
 		}
 
 		[Test]
+#if FEATURE_NO_BSD_SOCKETS
+		[ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
 		public void HttpRequestUriIsNotDecoded ()
 		{
 			var port = NetworkHelpers.FindFreePort ();
@@ -192,17 +203,29 @@ namespace MonoTests.System.Net
 		}
 
 		[Test]
+#if FEATURE_NO_BSD_SOCKETS
+		[ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
 		public void HttpRequestIsLocal ()
 		{
-			var ips = new List<IPAddress> (Dns.GetHostAddresses (Dns.GetHostName ()));
+			var port = NetworkHelpers.FindFreePort ();
+			var ips = new List<IPAddress> ();
 			ips.Add (IPAddress.Loopback);
+			foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces ()) {
+				if (adapter.OperationalStatus != OperationalStatus.Up)
+					continue;
+				foreach (var ip in adapter.GetIPProperties ().UnicastAddresses) {
+					ips.Add (ip.Address);
+				}
+			}
+
 			foreach (var ip in ips) {
 				if (ip.AddressFamily != AddressFamily.InterNetwork)
 					continue;
 
 				HttpListener listener = HttpListener2Test.CreateAndStartListener (
-					"http://" + ip + ":9000/HttpRequestIsLocal/");
-				NetworkStream ns = HttpListener2Test.CreateNS (ip, 9000);
+					"http://" + ip + ":" + port + "/HttpRequestIsLocal/");
+				NetworkStream ns = HttpListener2Test.CreateNS (ip, port);
 				HttpListener2Test.Send (ns, "GET /HttpRequestIsLocal/ HTTP/1.0\r\n\r\n");
 				HttpListenerContext ctx = listener.GetContext ();
 				HttpListenerRequest request = ctx.Request;
@@ -212,6 +235,9 @@ namespace MonoTests.System.Net
 		}
 
 		[Test] // #29927
+#if FEATURE_NO_BSD_SOCKETS
+		[ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
 		public void HttpRequestUriUnescape ()
 		{
 			var prefix = "http://localhost:" + NetworkHelpers.FindFreePort () + "/";
@@ -229,12 +255,50 @@ namespace MonoTests.System.Net
 			var request = (HttpWebRequest) WebRequest.Create (rawUrl);
 			request.GetResponseAsync ();
 
-			if(!contextTask.Wait (1000))
-				Assert.Fail ("Timeout");
+			Assert.IsTrue (contextTask.Wait (1000));
 
 			Assert.AreEqual (expectedUrl, contextTask.Result.Request.Url.AbsoluteUri);
 
 			listener.Close ();
 		}
+
+		[Test]
+#if FEATURE_NO_BSD_SOCKETS
+		[ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
+		public void EmptyWrite ()
+		{
+			var prefix = "http://localhost:" + NetworkHelpers.FindFreePort () + "/";
+
+			HttpListener listener = new HttpListener ();
+			listener.Prefixes.Add (prefix);
+			listener.Start ();
+
+			Task.Run (() => {
+				var context = listener.GetContext ();
+
+				var s = context.Response.OutputStream;
+				s.Write (new byte[10], 0, 0);
+				return;
+			});
+
+			var request = (HttpWebRequest)WebRequest.Create (prefix);
+			var rsp = request.GetResponseAsync ();
+			Assert.IsFalse (rsp.Wait (1000), "Don't send on empty write");
+		}
+
+		[Test]
+		public void HttpRequestIgnoreBadCookies ()
+		{
+			var port = NetworkHelpers.FindFreePort ();
+			HttpListener listener = HttpListener2Test.CreateAndStartListener (
+				"http://127.0.0.1:" + port + "/HttpRequestIgnoreBadCookiesTest/");
+			NetworkStream ns = HttpListener2Test.CreateNS (port);
+			HttpListener2Test.Send (ns, "GET /HttpRequestIgnoreBadCookiesTest/?a=b HTTP/1.1\r\nHost: 127.0.0.1\r\nCookie: ELOQUA=GUID=5ca2346347357f4-f877-4eff-96aa-70fe0b677650; ELQSTATUS=OK; WRUID=609099666.123259461695; CommunityServer-UserCookie2101=lv=Thu, 26 Jul 2012 15:25:11 GMT&mra=Mon, 01 Oct 2012 17:40:05 GMT; PHPSESSID=1234dg3opfjb4qafp0oo645; __utma=9761706.1153317537.1357240270.1357240270.1357317902.2; __utmb=9761706.6.10.1357317902; __utmc=9761706; __utmz=9761706.1357240270.1.1.utmcsr=test.testdomain.com|utmccn=(referral)|utmcmd=referral|utmcct=/test/1234\r\n\r\n");
+			HttpListenerContext ctx = listener.GetContext ();
+			HttpListenerRequest request = ctx.Request;
+			Assert.AreEqual ("/HttpRequestIgnoreBadCookiesTest/?a=b", request.Url.PathAndQuery);
+			listener.Close ();
+		}
 	}
 }