projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 741e611)
2007-07-21 Marek Habersack <mhabersack@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Sat, 21 Jul 2007 00:26:17 +0000 (00:26 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Sat, 21 Jul 2007 00:26:17 +0000 (00:26 -0000)
* HttpRuntime.cs: clean up the dynamic base directory on domain
shutdown.
2007-07-21  Marek Habersack  <mhabersack@novell.com>

* ApplicationHost.cs: ClearDynamicBaseDirectory becomes an
internal method.

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

mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs patch | blob | history
mcs/class/System.Web/System.Web.Hosting/ChangeLog patch | blob | history
mcs/class/System.Web/System.Web/ChangeLog patch | blob | history
mcs/class/System.Web/System.Web/HttpRuntime.cs patch | blob | history

diff --git a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
index 732b05405d3bc07cfb1cc966a02c87ae1b056b09..0159bbb4fe22253e3e1e36c25dc42189bb579c91 100644 (file)
--- a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
@@ -61,7 +61,7 @@ namespace System.Web.Hosting {
                static object create_dir = new object ();
 #endif
 
-               static bool ClearDynamicBaseDirectory (string directory)
+               internal static bool ClearDynamicBaseDirectory (string directory)
                {
                        string[] entries = null;
                        
diff --git a/mcs/class/System.Web/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
index 18adeb55dce1bb126afde5a29de1ed658530c0f6..db3b30b7dbfd6770fef1c59ce22d58e1e9f07c54 100644 (file)
--- a/mcs/class/System.Web/System.Web.Hosting/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-21  Marek Habersack  <mhabersack@novell.com>
+
+       * ApplicationHost.cs: ClearDynamicBaseDirectory becomes an
+       internal method.
+
 2007-07-12  Marek Habersack  <mhabersack@novell.com>
 
        * HostingEnvironment.cs: allow relative paths to be
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index b0dcfb254f03b0b0b3563c8a11741ff6ed37efc9..4980a6fbe795ac4ad18f5a3dbae09f4904647834 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-21  Marek Habersack  <mhabersack@novell.com>
+
+       * HttpRuntime.cs: clean up the dynamic base directory on domain
+       shutdown.
+
 2007-07-10  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * HttpUtility.cs: optimized HtmlEncode and HtmlAttributeEncode methods
diff --git a/mcs/class/System.Web/System.Web/HttpRuntime.cs b/mcs/class/System.Web/System.Web/HttpRuntime.cs
index 4e9f53e3550c1f9896ff01e1884fcb2a8eb67c06..b442dd6b9a87f4da6f7c984a5164182753632bd6 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRuntime.cs
+++ b/mcs/class/System.Web/System.Web/HttpRuntime.cs
@@ -393,16 +393,18 @@ namespace System.Web {
                        ThreadPool.QueueUserWorkItem (new WaitCallback (DoUnload), null);
                }
 
-#if TARGET_J2EE // No unload support for appdomains under Grasshopper
                static void DoUnload (object state)
                {
-               }
+                       if (Environment.GetEnvironmentVariable ("MONO_ASPNET_NODELETE") == null)
+                               System.Web.Hosting.ApplicationHost.ClearDynamicBaseDirectory (
+                                       AppDomain.CurrentDomain.SetupInformation.DynamicBase
+                               );
+#if TARGET_J2EE
+                       // No unload support for appdomains under Grasshopper
 #else
-               static void DoUnload (object state)
-               {
                        AppDomain.Unload (AppDomain.CurrentDomain);
-               }
 #endif
+               }
 
                 static string content503 = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n" +
                        "<html><head>\n<title>503 Server Unavailable</title>\n</head><body>\n" +
my mono mirror. check out Moved to http://github.com/mono/mono