Skip to content

Commit b790a33

Browse files
github-actions[bot]wfurtManickaP
authored
[release/8.0-staging] remove extra assert from WinHttp handler (#112861)
* remove extra assert from WinHttp * Update GeneratePackageOnBuild and ServicingVersion settings --------- Co-authored-by: wfurt <[email protected]> Co-authored-by: Marie Píchová <[email protected]>
1 parent 3ace3f7 commit b790a33

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<IsPackable>true</IsPackable>
7-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
8-
<ServicingVersion>2</ServicingVersion>
7+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8+
<ServicingVersion>3</ServicingVersion>
99
<PackageDescription>Provides a message handler for HttpClient based on the WinHTTP interface of Windows. While similar to HttpClientHandler, it provides developers more granular control over the application's HTTP communication than the HttpClientHandler.
1010

1111
Commonly Used Types:

src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,12 @@ private static void OnRequestRedirect(WinHttpRequestState state, Uri redirectUri
231231
private static void OnRequestSendingRequest(WinHttpRequestState state)
232232
{
233233
Debug.Assert(state != null, "OnRequestSendingRequest: state is null");
234-
Debug.Assert(state.RequestHandle != null, "OnRequestSendingRequest: state.RequestHandle is null");
235234
Debug.Assert(state.RequestMessage != null, "OnRequestSendingRequest: state.RequestMessage is null");
236235
Debug.Assert(state.RequestMessage.RequestUri != null, "OnRequestSendingRequest: state.RequestMessage.RequestUri is null");
237236

238-
if (state.RequestMessage.RequestUri.Scheme != UriScheme.Https)
237+
if (state.RequestMessage.RequestUri.Scheme != UriScheme.Https || state.RequestHandle == null)
239238
{
240-
// Not SSL/TLS.
239+
// Not SSL/TLS or request already gone
241240
return;
242241
}
243242

0 commit comments

Comments
 (0)