2009-01-15 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* HttpListenerRequest.cs: always initialize 'version'.
	* HttpConnection.cs: the socket might already be disconnected when
	shutting down.

svn path=/trunk/mcs/; revision=123453

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index 07d399e89360fe929a7ac351650c58d8c2518a21..b70b987501715404509d0f392d1576aa4f7b75ad 100644 (file)
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-15 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * HttpListenerRequest.cs: always initialize 'version'.
+       * HttpConnection.cs: the socket might already be disconnected when
+       shutting down.
+
 2009-01-14 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * WebConnectionStream.cs: if the buffer has been killed, return -1 for

diff --git a/mcs/class/System/System.Net/HttpConnection.cs b/mcs/class/System/System.Net/HttpConnection.cs
index 7e535ec1221f19fbef5299dedccc2f68c647956b..56579dc49f255a7fb590d678c98be13a173df5a4 100644 (file)
--- a/mcs/class/System/System.Net/HttpConnection.cs
+++ b/mcs/class/System/System.Net/HttpConnection.cs
@@ -324,6 +324,7 @@ namespace System.Net {
                                        sock = null;
                                        try {
                                                s.Shutdown (SocketShutdown.Both);
+                                       } catch {
                                        } finally {
                                                s.Close ();
                                        }

diff --git a/mcs/class/System/System.Net/HttpListenerRequest.cs b/mcs/class/System/System.Net/HttpListenerRequest.cs
index 4df1e4623992531959c4c6bfa25e910b7e84f0da..18586fb2df2a33cae7c98bee51a39d0d06cbf1d0 100644 (file)
--- a/mcs/class/System/System.Net/HttpListenerRequest.cs
+++ b/mcs/class/System/System.Net/HttpListenerRequest.cs
@@ -65,6 +65,7 @@ namespace System.Net {
                        this.context = context;
                        headers = new WebHeaderCollection ();
                        input_stream = Stream.Null;
+                       version = HttpVersion.Version10;
                }
 
                static char [] separators = new char [] { ' ' };