Author: mhabersack
Date: 2007-07-20 20:26:17 -0400 (Fri, 20 Jul 2007)
New Revision: 82403

Modified:
   trunk/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
   trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog
   trunk/mcs/class/System.Web/System.Web/ChangeLog
   trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs
Log:
2007-07-21  Marek Habersack  <[EMAIL PROTECTED]>

        * HttpRuntime.cs: clean up the dynamic base directory on domain
        shutdown.
2007-07-21  Marek Habersack  <[EMAIL PROTECTED]>

        * ApplicationHost.cs: ClearDynamicBaseDirectory becomes an
        internal method.


Modified: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog     2007-07-21 00:03:25 UTC 
(rev 82402)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog     2007-07-21 00:26:17 UTC 
(rev 82403)
@@ -1,3 +1,8 @@
+2007-07-21  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * HttpRuntime.cs: clean up the dynamic base directory on domain
+       shutdown.
+
 2007-07-10  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
        * HttpUtility.cs: optimized HtmlEncode and HtmlAttributeEncode methods

Modified: trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs        2007-07-21 
00:03:25 UTC (rev 82402)
+++ trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs        2007-07-21 
00:26:17 UTC (rev 82403)
@@ -393,16 +393,18 @@
                        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
                }
-#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" +

Modified: trunk/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs    
2007-07-21 00:03:25 UTC (rev 82402)
+++ trunk/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs    
2007-07-21 00:26:17 UTC (rev 82403)
@@ -61,7 +61,7 @@
                static object create_dir = new object ();
 #endif
 
-               static bool ClearDynamicBaseDirectory (string directory)
+               internal static bool ClearDynamicBaseDirectory (string 
directory)
                {
                        string[] entries = null;
                        

Modified: trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog     2007-07-21 
00:03:25 UTC (rev 82402)
+++ trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog     2007-07-21 
00:26:17 UTC (rev 82403)
@@ -1,3 +1,8 @@
+2007-07-21  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * ApplicationHost.cs: ClearDynamicBaseDirectory becomes an
+       internal method.
+
 2007-07-12  Marek Habersack  <[EMAIL PROTECTED]>
 
        * HostingEnvironment.cs: allow relative paths to be

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to