Author: zoltan
Date: 2008-02-21 06:06:54 -0500 (Thu, 21 Feb 2008)
New Revision: 96332
Modified:
branches/mono-1-9/mcs/class/System/System.Net/ChangeLog
branches/mono-1-9/mcs/class/System/System.Net/HttpConnection.cs
Log:
Merge from HEAD.
Modified: branches/mono-1-9/mcs/class/System/System.Net/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/System/System.Net/ChangeLog 2008-02-21
11:04:49 UTC (rev 96331)
+++ branches/mono-1-9/mcs/class/System/System.Net/ChangeLog 2008-02-21
11:06:54 UTC (rev 96332)
@@ -1,3 +1,8 @@
+2008-02-21 Zoltan Varga <[EMAIL PROTECTED]>
+
+ [Backport from r96331 to 1.9]
+ * HttpConnection.cs (Close): Close the socket even if Shutdown throws
an exception.
+
2008-02-17 Daniel Nauck <[EMAIL PROTECTED]>
[Backport from r95967 to 1.9]
Modified: branches/mono-1-9/mcs/class/System/System.Net/HttpConnection.cs
===================================================================
--- branches/mono-1-9/mcs/class/System/System.Net/HttpConnection.cs
2008-02-21 11:04:49 UTC (rev 96331)
+++ branches/mono-1-9/mcs/class/System/System.Net/HttpConnection.cs
2008-02-21 11:06:54 UTC (rev 96332)
@@ -313,8 +313,11 @@
Socket s = sock;
sock = null;
- s.Shutdown (SocketShutdown.Both);
- s.Close ();
+ try {
+ s.Shutdown (SocketShutdown.Both);
+ } finally {
+ s.Close ();
+ }
if (context_bound)
epl.UnbindContext (context);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
