X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Runtime.Remoting%2FSystem.Runtime.Remoting.Channels.Http%2FHttpRemotingHandlerFactory.cs;h=ccfc32a11542b049df7980872e2a58d9d41b4484;hb=33028b1a2c0d0345efc3639f3b33d74dc96daf62;hp=fa7c5df2d744367c6d9422928dc630ac7070e7ed;hpb=c4aef31eeea309e6a795c84c098ac8e1a2490340;p=mono.git

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 fa7c5df2d74..ccfc32a1154 100644
--- 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;
 			}
 		}