Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -1851,6 +1851,7 @@ namespace System.Web {
protected string _message;
private Exception _e;
private StringCollection _adaptiveMiscContent = new StringCollection();
private bool _allowSourceCode;
internal ConfigErrorFormatter(System.Configuration.ConfigurationException e)
: base(null /*virtualPath*/, e.Filename, null, e.Line) {
@@ -1861,6 +1862,11 @@ namespace System.Web {
_adaptiveMiscContent.Add(_message);
}
public bool AllowSourceCode {
get { return _allowSourceCode; }
set { _allowSourceCode = value; }
}
protected override Encoding SourceFileEncoding {
get { return Encoding.UTF8; }
}
@@ -1892,6 +1898,16 @@ namespace System.Web {
protected override StringCollection AdaptiveMiscContent {
get { return _adaptiveMiscContent;}
}
protected override string ColoredSquareContent {
get {
if (!AllowSourceCode) {
return SR.GetString(SR.Generic_Err_Remote_Desc);
}
return base.ColoredSquareContent;
}
}
}
/*