* HttpHelper.cs: Fixed bug #48468. Patch by Jean-Marc Andre.

	* HttpClientChannel.cs HttpServer.cs HttpServerChannel.cs: Fixed some warnings.

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

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
index 2b9ff524380229212bef69b145f340752d6b4032..634c377d4202e6c4d825f754a443d89bb387b40c 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-17  Lluis Sanchez Gual <lluis@ximian.com>
+
+       * HttpHelper.cs: Fixed bug #48468. Patch by Jean-Marc Andre.
+       * HttpClientChannel.cs HttpServer.cs HttpServerChannel.cs: Fixed some warnings.
+
 2003-08-22  Lluis Sanchez Gual <lluis@ximian.com>
 
        * HttpClientChannel.cs: Changed text for user-agent header (removed references

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
index 8e43472700d82411c3577cd60df54c5e1e3d3865..dedaa5aa4ccb8144f91dc0ada126a7546699683c 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
@@ -34,11 +34,6 @@ namespace System.Runtime.Remoting.Channels.Http
                private const String ProxyNameKey = "proxyname";
                private const String ProxyPortKey = "proxyport";
 
-               // If above keys get modified be sure to modify, the KeySet property on this
-               // class.
-               private static ICollection s_keySet = null;
-        
-    
                // Settings
                private int    _channelPriority = 1;  // channel priority
                private String _channelName = "http"; // channel name
@@ -286,7 +281,7 @@ namespace System.Runtime.Remoting.Channels.Http
 
                // settings
                private bool _useChunked = false; 
-               private bool _useKeepAlive = true;
+//             private bool _useKeepAlive = true;
 
                internal HttpClientTransportSink(HttpClientChannel channel, String channelURI) : base()
                {
@@ -517,7 +512,7 @@ namespace System.Runtime.Remoting.Channels.Http
                        //request.Expect = "100-Continue";
                        
                        //This caused us some troubles with the HttpWebResponse class
-                       //maybe its fixed now.
+                       //maybe its fixed now. TODO
                        //request.KeepAlive = _useKeepAlive;
                        request.KeepAlive = false;;
                        

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs
index 5cde8444f9f75cfd8dd5ac3252e574fd10e5640d..09f6579155bbc0e1fecc9d2afabcd740b306ef1a 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs
@@ -27,23 +27,20 @@ namespace System.Runtime.Remoting.Channels.Http
 
                        int Pos;
                        ObjectURI = null;
+                       string ChannelURI = null;
                        
 
                        if(StartsWithHttp(URL))
                        {
                                Pos = URL.IndexOf("/",7);
+                               if(Pos >= 0) 
+                               {
+                                       ObjectURI = URL.Substring(Pos);
+                                       ChannelURI = URL.Substring(0, Pos);
+                               }
+                               else ChannelURI = URL;
                        }
-                       else
-                       {
-                               Pos = URL.IndexOf("/",0);
-                       }
-
-                       if(Pos >= 0)
-                       {
-                               ObjectURI = URL.Substring(Pos + 1);
-                               return URL.Substring(0,Pos);
-                       }
-                       return URL;
+                       return ChannelURI;
                        
                }
 

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServer.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServer.cs
index 64577e879d7e637818f7c5d6cf59327e22d07238..aad9c710ac40703e2dfc0a58c71ac933a2cd0999 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServer.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServer.cs
@@ -41,7 +41,6 @@ namespace System.Runtime.Remoting.Channels.Http
 
        internal sealed class HttpServer
        {
-               public int port;
                private TcpListener listener=null;
                private const int nTimeOut = 1000;
                

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
index c3bcf6a87a51100a86cfbb46914cb976425c9a23..2f399a38977a677d95144f2c785f6c944fbcb4dc 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
@@ -50,13 +50,11 @@ namespace System.Runtime.Remoting.Channels.Http
                private IServerChannelSink         _sinkChain = null;
 
                private bool _wantsToListen = true;
-               private bool _bHooked = false; // has anyone hooked into the channel?       
         
         
                private TcpListener _tcpListener;
                private Thread      _listenerThread;
                private bool        _bListening = false; // are we listening at the moment?
-               private Exception   _startListeningException = null; // if an exception happens on the listener thread when attempting
                //   to start listening, that will get set here.
                private AutoResetEvent  _waitForStartListening = new AutoResetEvent(false);