Skip to content

Commit 327b876

Browse files
Merge pull request #11129 from dotnet/main
Merge main into live
2 parents c7af35e + 22e3cae commit 327b876

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

xml/System.Net.Http/HttpClientHandler.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
If you are using cookies by specifically adding them to the <xref:System.Net.Http.HttpRequestMessage.Headers> collection, these are not cleared when a redirect is followed, as the handler has no way of knowing what domain a cookie is allowed for. If you want to mimic browser behavior, use the <xref:System.Net.CookieContainer> class which allows you to specify the target domain for a cookie.
139139
140140
> [!NOTE]
141-
> With <xref:System.Net.Http.HttpClientHandler.AllowAutoRedirect%2A> set to `true`, the .NET Framework will follow redirections even when being redirected to an HTTP URI from an HTTPS URI.
142-
.NET Core versions 1.0, 1.1 and 2.0 will not follow a redirection from HTTPS to HTTP even if <xref:System.Net.Http.HttpClientHandler.AllowAutoRedirect%2A> is set to `true`.
141+
> On .NET Core and .NET 5 and later versions, setting <xref:System.Net.Http.HttpClientHandler.AllowAutoRedirect> to `true` **does not enable** automatic redirection to an HTTP URI from an HTTPS URI.
142+
> Such (secure to insecure) redirections are only followed on .NET Framework.
143143
144144
]]></format>
145145
</remarks>

xml/System.Runtime.CompilerServices/UnsafeAccessorAttribute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The first argument must be passed as `ref` for instance fields and methods on st
4444
4545
The value of the first argument is not used by the implementation for `static` fields and methods and can be `null`.
4646
47-
The return value for an accessor to a field can be `ref` if setting of the field is desired.
47+
The return value for an accessor to a field must be passed as `ref`.
4848
4949
Constructors can be accessed using <xref:System.Runtime.CompilerServices.UnsafeAccessorKind.Constructor> or <xref:System.Runtime.CompilerServices.UnsafeAccessorKind.Method>.
5050

0 commit comments

Comments
 (0)