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;

View File

@@ -400,6 +400,13 @@ namespace System.Web
set;
}
#if NET_4_5
public bool SuppressFormsAuthenticationRedirect {
get;
set;
}
#endif
public bool TrySkipIisCustomErrors {
get;
set;

View File

@@ -56,7 +56,7 @@ namespace System.Web {
StringBuilder sb = new StringBuilder ();
string [] keys = AllKeys;
for (int i = 0; i < count; i++) {
sb.AppendFormat ("{0}={1}&", keys [i], this [keys [i]]);
sb.AppendFormat ("{0}={1}&", keys [i], UrlEncode (this [keys [i]]));
}
if (sb.Length > 0)
sb.Length--;

View File

@@ -233,6 +233,7 @@ namespace System.Web
mimeTypes.Add ("la", "audio/nspaudio");
mimeTypes.Add ("lam", "audio/x-liveaudio");
mimeTypes.Add ("latex", "application/x-latex");
mimeTypes.Add ("less", "text/css");
mimeTypes.Add ("list", "text/plain");
mimeTypes.Add ("lma", "audio/nspaudio");
mimeTypes.Add ("log", "text/plain");
@@ -529,7 +530,7 @@ namespace System.Web
mimeTypes.Add ("wmls", "text/vnd.wap.wmlscript");
mimeTypes.Add ("wml", "text/vnd.wap.wml");
mimeTypes.Add ("wmp", "video/x-ms-wmp");
mimeTypes.Add ("woff", "application/x-woff");
mimeTypes.Add ("woff", "application/font-woff");
mimeTypes.Add ("word", "application/msword");
mimeTypes.Add ("wp5", "application/wordperfect");
mimeTypes.Add ("wp6", "application/wordperfect");

View File

@@ -0,0 +1,34 @@
//
// ReadEntityBodyMode.cs
//
// Author: Martin Thwaites (github@my2cents.co.uk)
//
// Copyright (C) 2014 Martin Thwaites
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
namespace System.Web {
public enum ReadEntityBodyMode {
None,
Classic,
Bufferless,
Buffered,
}
}