Author: mhabersack
Date: 2008-02-05 18:27:57 -0500 (Tue, 05 Feb 2008)
New Revision: 94972
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web/ChangeLog
branches/mono-1-9/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
branches/mono-1-9/mcs/class/System.Web/System.Web/HttpRuntime.cs
Log:
Backport of r94971
Modified: branches/mono-1-9/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web/ChangeLog 2008-02-05
23:26:46 UTC (rev 94971)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web/ChangeLog 2008-02-05
23:27:57 UTC (rev 94972)
@@ -1,3 +1,11 @@
+2008-02-06 Marek Habersack <[EMAIL PROTECTED]>
+
+ * HttpApplicationFactory.cs: in FireOnAppEnd, set app_type to null
+ after the event has been fired.
+
+ * HttpRuntime.cs: when switching to offline mode fire the
+ shutdown events. Fixes bug #357565.
+
2008-01-27 Igor Zelmanovich <[EMAIL PROTECTED]>
* HttpResponse.cs: rise PreSendRequestHeaders befire headers_sent
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
2008-02-05 23:26:46 UTC (rev 94971)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
2008-02-05 23:27:57 UTC (rev 94972)
@@ -191,6 +191,7 @@
HttpApplication app = (HttpApplication)
Activator.CreateInstance (app_type, true);
FireEvent ("Application_End", app, new object [] {new
object (), EventArgs.Empty});
app.Dispose ();
+ app_type = null;
}
//
Modified: branches/mono-1-9/mcs/class/System.Web/System.Web/HttpRuntime.cs
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web/HttpRuntime.cs
2008-02-05 23:26:46 UTC (rev 94971)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web/HttpRuntime.cs
2008-02-05 23:27:57 UTC (rev 94972)
@@ -380,6 +380,8 @@
app_offline_file = filePath;
HttpApplicationFactory.DisableWatchers ();
HttpApplicationFactory.ApplicationDisabled =
true;
+ InternalCache.InvokePrivateCallbacks ();
+ HttpApplicationFactory.Dispose ();
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
