diff options
author | Alex Rønne Petersen <alexrp@xamarin.com> | 2015-12-10 20:23:22 +0300 |
---|---|---|
committer | Alex Rønne Petersen <alexrp@xamarin.com> | 2016-01-13 07:42:45 +0300 |
commit | 902f758f913e84fa8a390e9096151d2e1909e2c2 (patch) | |
tree | e2655081b7b6cbc17516e7ee7aa270965e93e822 /mcs | |
parent | 1f914414b4e335a1df53802d018abae2017ff6f7 (diff) |
Revert "[bcl] Fix System.Net.HttpWebRequestTest.GetRequestStream hang"
This reverts commit b3fa096e5eceea1c3b289b3655244a42c2884274.
The Abort () call is problematic on many platforms and is no longer necessary
as we properly close the listening socket since 1103abf3830131ba2a1deabc133e8d27402302c7.
Conflicts:
mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SocketResponder.cs
mcs/class/System/Test/System.Net/SocketResponder.cs
Diffstat (limited to 'mcs')
-rw-r--r-- | mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SocketResponder.cs | 7 | ||||
-rw-r--r-- | mcs/class/System/Test/System.Net/SocketResponder.cs | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SocketResponder.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SocketResponder.cs index 2ebe7cf7b8e..8e26ee6fbfc 100644 --- a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SocketResponder.cs +++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SocketResponder.cs @@ -96,13 +96,6 @@ namespace MonoTests.System.Web.Services.Protocols if (tcpListener != null) { tcpListener.Stop (); tcpListener = null; -#if MONO_FEATURE_THREAD_ABORT - listenThread.Abort (); -#else - listenThread.Interrupt (); -#endif - listenThread.Join (); - listenThread = null; } } } diff --git a/mcs/class/System/Test/System.Net/SocketResponder.cs b/mcs/class/System/Test/System.Net/SocketResponder.cs index af05477fb6b..db4dbcecdcf 100644 --- a/mcs/class/System/Test/System.Net/SocketResponder.cs +++ b/mcs/class/System/Test/System.Net/SocketResponder.cs @@ -105,13 +105,6 @@ namespace MonoTests.System.Net tcpListener = null; if (listenSocket != null) listenSocket.Close (); -#if MONO_FEATURE_THREAD_ABORT - listenThread.Abort (); -#else - listenThread.Interrupt (); -#endif - listenThread.Join (); - listenThread = null; Thread.Sleep (50); } } |