Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -731,7 +731,7 @@ namespace System.Web {
// which doesn't fit our expected patterns and where that code likely has negative side effects.
//
// This flag is respected only by AspNetSynchronizationContext; it has no effect when the
// legacy [....] context is in use.
// legacy sync context is in use.
[EditorBrowsable(EditorBrowsableState.Advanced)]
public bool AllowAsyncDuringSyncStages {
get {
@ -1328,7 +1328,7 @@ namespace System.Web {
return _rootedObjects;
}
set {
// [....] the Principal between the containers
// Sync the Principal between the containers
SwitchPrincipalContainer(value);
_rootedObjects = value;
}