Imported Upstream version 3.12.0

Former-commit-id: cf92446697332992ec36726e78eb8703e1f259d7
This commit is contained in:
Jo Shields
2015-01-13 10:44:36 +00:00
parent 8b9b85e7f5
commit 181b81b4a4
659 changed files with 12743 additions and 16300 deletions

View File

@@ -230,6 +230,10 @@ namespace System.Web
}
} catch (Exception e) {
initialization_exception = e;
Console.Error.WriteLine("Exception while initOnce: "+e.ToString());
// Once initialization_exception != null, we always respond with this exception
// You have to restart the HttpApplication to "unlock" it
Console.Error.WriteLine("Please restart your app to unlock it");
} finally {
if (mustNullContext)
context = null;
@@ -1549,6 +1553,7 @@ namespace System.Web
if (initialization_exception != null) {
Exception e = initialization_exception;
HttpException exc = HttpException.NewWithCode (String.Empty, e, WebEventCodes.RuntimeErrorRequestAbort);
context.Response.StatusCode = 500;
FinalErrorWrite (context.Response, exc.GetHtmlErrorMessage ());
PipelineDone ();
return;