New tests, updates.

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels.Http / HttpRemotingHandlerFactory.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs
index fa7c5df2d744367c6d9422928dc630ac7070e7ed..ccfc32a11542b049df7980872e2a58d9d41b4484 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs
@@ -61,6 +61,10 @@ namespace System.Runtime.Remoting.Channels.Http
                        lock (GetType())
                        {
                                if (webConfigLoaded) return;
+
+                               string appConfig = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
+                               if (File.Exists (appConfig))
+                                       RemotingConfiguration.Configure (appConfig);
                                                        
                                // Look for a channel that wants to receive http request
                                IChannelReceiverHook chook = null;
@@ -95,8 +99,8 @@ namespace System.Runtime.Remoting.Channels.Http
                                string channelUrl = context.Request.Url.GetLeftPart(UriPartial.Authority);
                                channelUrl += context.Request.ApplicationPath;
                                chook.AddHookChannelUri (channelUrl);
-                                       
-                               transportSink = new HttpServerTransportSink (chook.ChannelSinkChain, null);
+                               
+                               transportSink = new HttpServerTransportSink (chook.ChannelSinkChain);
                                webConfigLoaded = true;
                        }
                }