In System.Web/System.Web.Configuration:

2007-08-23  Robert Jordan  <robertj@gmx.net>

	* WebConfigurationSettings.cs: Move RemotingConfiguration to
	System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs.
	Fixes #19384.

In System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http:
2007-08-23  Robert Jordan  <robertj@gmx.net>

	* HttpRemotingHandlerFactory.cs: configure Remoting because
	System.Web doesn't anymore. Fixes #81831.

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

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 2a77458ba64848d5352c499ff658cdaeafd7fce3..3907825ca2dd264d77159f7123078f8266b207b3 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 @@
+2007-08-23  Robert Jordan  <robertj@gmx.net>
+
+       * HttpRemotingHandlerFactory.cs: configure Remoting because
+       System.Web doesn't anymore. Fixes #81831.
+
 2006-12-18  Lluis Sanchez Gual  <lluis@novell.com>
 
        * HttpServerChannel.cs: The remoting infrastructure does not call

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..b6878a7d37f00be222f445f017d62c6df4c9dc59 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;

diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index 399796191d3052bc70763aeda99391f476b7bb6e..07c412f548638ef8560b8280f715efc1e05b767c 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-23  Robert Jordan  <robertj@gmx.net>
+
+       * WebConfigurationSettings.cs: Move RemotingConfiguration to
+       System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs.
+       Fixes #19384.
+
 2007-08-10  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * PagesConfigurationHandler.cs: Use enum for EnableSessionState.

diff --git a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
index 4d56486902f7c28900d2b9c618872d19bd84f5a9..aa3be6d10683cf46c357d4a1b4de85ed81ee9dfc 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
@@ -33,7 +33,6 @@ using System.Configuration;
 using System.Collections;
 using System.IO;
 using System.Reflection;
-using System.Runtime.Remoting;
 using System.Web.Util;
 using System.Xml;
 #if TARGET_J2EE
@@ -249,7 +248,6 @@ namespace System.Web.Configuration
                                data.DirName = dir;
                                data.LoadFromFile (wcfile);
                                fileToConfig [dir] = data;
-                               RemotingConfiguration.Configure (wcfile);
                        }
 
                        return data;
@@ -317,8 +315,6 @@ namespace System.Web.Configuration
                        lock (data) {
                                cacheTable.Clear ();
                                data.Reset ();
-                               if (args.ChangeType == WatcherChangeTypes.Created)
-                                       RemotingConfiguration.Configure (args.FullPath);
 
                                if (args.ChangeType != WatcherChangeTypes.Deleted)
                                        data.LoadFromFile (args.FullPath);