Author: robertj
Date: 2007-08-23 02:47:58 -0400 (Thu, 23 Aug 2007)
New Revision: 84681
Modified:
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs
trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
trunk/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
Log:
In System.Web/System.Web.Configuration:
2007-08-23 Robert Jordan <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
* HttpRemotingHandlerFactory.cs: configure Remoting because
System.Web doesn't anymore. Fixes #81831.
Modified:
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
===================================================================
---
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
2007-08-23 06:22:53 UTC (rev 84680)
+++
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
2007-08-23 06:47:58 UTC (rev 84681)
@@ -1,3 +1,8 @@
+2007-08-23 Robert Jordan <[EMAIL PROTECTED]>
+
+ * HttpRemotingHandlerFactory.cs: configure Remoting because
+ System.Web doesn't anymore. Fixes #81831.
+
2006-12-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* HttpServerChannel.cs: The remoting infrastructure does not call
Modified:
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs
===================================================================
---
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs
2007-08-23 06:22:53 UTC (rev 84680)
+++
trunk/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs
2007-08-23 06:47:58 UTC (rev 84681)
@@ -61,6 +61,10 @@
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;
Modified: trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
2007-08-23 06:22:53 UTC (rev 84680)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
2007-08-23 06:47:58 UTC (rev 84681)
@@ -1,3 +1,9 @@
+2007-08-23 Robert Jordan <[EMAIL PROTECTED]>
+
+ * WebConfigurationSettings.cs: Move RemotingConfiguration to
+ System.Runtime.Remoting.Channels.Http/HttpRemotingHandlerFactory.cs.
+ Fixes #19384.
+
2007-08-10 Gert Driesen <[EMAIL PROTECTED]>
* PagesConfigurationHandler.cs: Use enum for EnableSessionState.
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
2007-08-23 06:22:53 UTC (rev 84680)
+++
trunk/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
2007-08-23 06:47:58 UTC (rev 84681)
@@ -33,7 +33,6 @@
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 @@
data.DirName = dir;
data.LoadFromFile (wcfile);
fileToConfig [dir] = data;
- RemotingConfiguration.Configure (wcfile);
}
return data;
@@ -317,8 +315,6 @@
lock (data) {
cacheTable.Clear ();
data.Reset ();
- if (args.ChangeType ==
WatcherChangeTypes.Created)
- RemotingConfiguration.Configure
(args.FullPath);
if (args.ChangeType !=
WatcherChangeTypes.Deleted)
data.LoadFromFile (args.FullPath);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
