Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -139,7 +139,8 @@ namespace System.Web.Configuration {
HttpCapabilitiesBase capabilities = null;
// Get the config evaluator from the cached config object.
HttpCapabilitiesDefaultProvider capsbuilder = RuntimeConfig.GetConfig(request.Context).BrowserCaps;
HttpCapabilitiesDefaultProvider capsbuilder = request.Context.IsRuntimeErrorReported ?
RuntimeConfig.GetLKGConfig(request.Context).BrowserCaps : RuntimeConfig.GetConfig(request.Context).BrowserCaps;
if (capsbuilder != null) {
if (BrowserCapabilitiesProvider != null) {
capsbuilder.BrowserCapabilitiesProvider = BrowserCapabilitiesProvider;