Skip to content

Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717

Merged
stephentoub merged 4 commits into
dotnet:masterfrom
stephentoub:zlibstream
Oct 9, 2020
Merged

Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom
stephentoub:zlibstream

Conversation

@stephentoub

@stephentoubstephentoub commented Sep 25, 2020•
edited
Loading

Copy link
Copy Markdown
Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"

Fixes#2236
Fixes#38022
(This completes the commit from #2236 (comment).)

The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.

cc: @ericstj@carlossanlop@geoffkizer

@Dotnet-GitSync-Bot

Dotnet-GitSync-Bot commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

@ghost

ghost commented Sep 25, 2020

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/ncl
See info in area-owners.md if you want to be subscribed.

stephentoub
stephentoub commented Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs Outdated
stephentoub
stephentoub commented Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs Outdated
@stephentoubstephentoub added this to the 6.0.0 milestone Sep 25, 2020
geoffkizer
geoffkizer reviewed Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs Outdated
geoffkizer
geoffkizer reviewed Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs Outdated
@runfoapprunfoappBot mentioned this pull request Sep 28, 2020
Closed
carlossanlop
carlossanlop approved these changes Oct 6, 2020
View reviewed changes

@carlossanlopcarlossanlop left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs Outdated
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs Outdated
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs Outdated
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs Outdated
@carlossanlop

carlossanlop commented Oct 6, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

One of the CI failures is:

F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D

For example (the spanish error message says "operacion anulada" which means "aborted operation"):

System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub added the breaking-change Issue or PR that represents a breaking API or functional change over a previous release. label Oct 7, 2020
@ghostghost added the needs-breaking-change-doc-created Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet label Oct 7, 2020
@stephentoub
stephentoubforce-pushed the zlibstream branch 2 times, most recently from cc8d4d6 to bc948e8CompareOctober 8, 2020 21:20
stephentouband others added 4 commits October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub merged commit d3beb60 into dotnet:masterOct 9, 2020
@stephentoub
stephentoub deleted the zlibstream branch October 9, 2020 10:12
This was referenced Oct 12, 2020
Closed
Closed
@JamesNKJamesNK mentioned this pull request Nov 9, 2020
Closed
@ghostghost locked as resolved and limited conversation to collaborators Dec 7, 2020
@stephentoubstephentoub removed breaking-change Issue or PR that represents a breaking API or functional change over a previous release. needs-breaking-change-doc-created Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet labels Sep 30, 2021
@karelz

karelz commented Oct 4, 2021

Copy link
Copy Markdown
Member

@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?
And there is no impact on server it seems ...

@stephentoub

stephentoub commented Oct 4, 2021

Copy link
Copy Markdown
MemberAuthor

is that because you implemented the detection that accepts both?

Correct.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ericstjericstjericstj approved these changes
+2 more reviewers
@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects

None yet

Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly Add support for zlib data format (RFC 1950)

6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Implement ZLibStream and fix SocketsHttpHandler deflate support by stephentoub · Pull Request #42717 · dotnet/runtime · GitHub
Skip to content
Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717
Merged
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Oct 9, 2020
Merged
Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Conversation
@stephentoub
@stephentoubstephentoub
commented
Sep 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"
Fixes#2236
Fixes#38022

(This completes the commit from #2236 (comment).)
The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.
cc: @ericstj@carlossanlop@geoffkizer
@Dotnet-GitSync-Bot
Dotnet-GitSync-Bot
commented
Sep 25, 2020

Copy link


Copy Markdown

Collaborator
Note regarding the new-api-needs-documentation label:
This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.
@ghost
ghost
commented
Sep 25, 2020

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.
stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
Outdated

stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@stephentoubstephentoub
added this to the 6.0.0 milestone
Sep 25, 2020
geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
Outdated

geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@runfoapprunfoappBot
mentioned this pull request
Sep 28, 2020

Closed

carlossanlop
carlossanlop
approved these changes
Oct 6, 2020
View reviewed changes
@carlossanlopcarlossanlop
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@carlossanlop
carlossanlop
commented
Oct 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
One of the CI failures is:
F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D
For example (the spanish error message says "operacion anulada" which means "aborted operation"):
System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub
added
the 
breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
label
Oct 7, 2020
@ghostghost
added
the 
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
label
Oct 7, 2020
@stephentoub
stephentoubforce-pushed
the
zlibstream
branch
2 times, most recently
from
cc8d4d6 to
bc948e8CompareOctober 8, 2020 21:20
stephentouband others
added 4 commits
October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub
merged commit d3beb60
into
dotnet:masterOct 9, 2020
@stephentoub
stephentoub
deleted the

zlibstream

branch
October 9, 2020 10:12

This was referenced Oct 12, 2020

Closed


Closed

@JamesNKJamesNK
mentioned this pull request
Nov 9, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 7, 2020
@stephentoubstephentoub
removed

breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
labels
Sep 30, 2021
@karelz
karelz
commented
Oct 4, 2021

Copy link


Copy Markdown

Member
@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?

And there is no impact on server it seems ...
@stephentoub
stephentoub
commented
Oct 4, 2021

Copy link


Copy Markdown

MemberAuthor
is that because you implemented the detection that accepts both?
Correct.
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj approved these changes

+2 more reviewers

@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects


None yet


Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly

Add support for zlib data format (RFC 1950)


6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement ZLibStream and fix SocketsHttpHandler deflate support by stephentoub · Pull Request #42717 · dotnet/runtime · GitHub
Skip to content
Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717
Merged
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Oct 9, 2020
Merged
Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Conversation
@stephentoub
@stephentoubstephentoub
commented
Sep 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"
Fixes#2236
Fixes#38022

(This completes the commit from #2236 (comment).)
The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.
cc: @ericstj@carlossanlop@geoffkizer
@Dotnet-GitSync-Bot
Dotnet-GitSync-Bot
commented
Sep 25, 2020

Copy link


Copy Markdown

Collaborator
Note regarding the new-api-needs-documentation label:
This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.
@ghost
ghost
commented
Sep 25, 2020

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.
stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
Outdated

stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@stephentoubstephentoub
added this to the 6.0.0 milestone
Sep 25, 2020
geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
Outdated

geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@runfoapprunfoappBot
mentioned this pull request
Sep 28, 2020

Closed

carlossanlop
carlossanlop
approved these changes
Oct 6, 2020
View reviewed changes
@carlossanlopcarlossanlop
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@carlossanlop
carlossanlop
commented
Oct 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
One of the CI failures is:
F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D
For example (the spanish error message says "operacion anulada" which means "aborted operation"):
System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub
added
the 
breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
label
Oct 7, 2020
@ghostghost
added
the 
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
label
Oct 7, 2020
@stephentoub
stephentoubforce-pushed
the
zlibstream
branch
2 times, most recently
from
cc8d4d6 to
bc948e8CompareOctober 8, 2020 21:20
stephentouband others
added 4 commits
October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub
merged commit d3beb60
into
dotnet:masterOct 9, 2020
@stephentoub
stephentoub
deleted the

zlibstream

branch
October 9, 2020 10:12

This was referenced Oct 12, 2020

Closed


Closed

@JamesNKJamesNK
mentioned this pull request
Nov 9, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 7, 2020
@stephentoubstephentoub
removed

breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
labels
Sep 30, 2021
@karelz
karelz
commented
Oct 4, 2021

Copy link


Copy Markdown

Member
@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?

And there is no impact on server it seems ...
@stephentoub
stephentoub
commented
Oct 4, 2021

Copy link


Copy Markdown

MemberAuthor
is that because you implemented the detection that accepts both?
Correct.
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj approved these changes

+2 more reviewers

@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects


None yet


Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly

Add support for zlib data format (RFC 1950)


6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement ZLibStream and fix SocketsHttpHandler deflate support by stephentoub · Pull Request #42717 · dotnet/runtime · GitHub
Skip to content
Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717
Merged
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Oct 9, 2020
Merged
Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Conversation
@stephentoub
@stephentoubstephentoub
commented
Sep 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"
Fixes#2236
Fixes#38022

(This completes the commit from #2236 (comment).)
The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.
cc: @ericstj@carlossanlop@geoffkizer
@Dotnet-GitSync-Bot
Dotnet-GitSync-Bot
commented
Sep 25, 2020

Copy link


Copy Markdown

Collaborator
Note regarding the new-api-needs-documentation label:
This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.
@ghost
ghost
commented
Sep 25, 2020

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.
stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
Outdated

stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@stephentoubstephentoub
added this to the 6.0.0 milestone
Sep 25, 2020
geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
Outdated

geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@runfoapprunfoappBot
mentioned this pull request
Sep 28, 2020

Closed

carlossanlop
carlossanlop
approved these changes
Oct 6, 2020
View reviewed changes
@carlossanlopcarlossanlop
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@carlossanlop
carlossanlop
commented
Oct 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
One of the CI failures is:
F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D
For example (the spanish error message says "operacion anulada" which means "aborted operation"):
System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub
added
the 
breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
label
Oct 7, 2020
@ghostghost
added
the 
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
label
Oct 7, 2020
@stephentoub
stephentoubforce-pushed
the
zlibstream
branch
2 times, most recently
from
cc8d4d6 to
bc948e8CompareOctober 8, 2020 21:20
stephentouband others
added 4 commits
October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub
merged commit d3beb60
into
dotnet:masterOct 9, 2020
@stephentoub
stephentoub
deleted the

zlibstream

branch
October 9, 2020 10:12

This was referenced Oct 12, 2020

Closed


Closed

@JamesNKJamesNK
mentioned this pull request
Nov 9, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 7, 2020
@stephentoubstephentoub
removed

breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
labels
Sep 30, 2021
@karelz
karelz
commented
Oct 4, 2021

Copy link


Copy Markdown

Member
@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?

And there is no impact on server it seems ...
@stephentoub
stephentoub
commented
Oct 4, 2021

Copy link


Copy Markdown

MemberAuthor
is that because you implemented the detection that accepts both?
Correct.
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj approved these changes

+2 more reviewers

@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects


None yet


Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly

Add support for zlib data format (RFC 1950)


6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Implement ZLibStream and fix SocketsHttpHandler deflate support by stephentoub · Pull Request #42717 · dotnet/runtime · GitHub
Skip to content
Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717
Merged
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Oct 9, 2020
Merged
Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Conversation
@stephentoub
@stephentoubstephentoub
commented
Sep 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"
Fixes#2236
Fixes#38022

(This completes the commit from #2236 (comment).)
The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.
cc: @ericstj@carlossanlop@geoffkizer
@Dotnet-GitSync-Bot
Dotnet-GitSync-Bot
commented
Sep 25, 2020

Copy link


Copy Markdown

Collaborator
Note regarding the new-api-needs-documentation label:
This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.
@ghost
ghost
commented
Sep 25, 2020

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.
stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
Outdated

stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@stephentoubstephentoub
added this to the 6.0.0 milestone
Sep 25, 2020
geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
Outdated

geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@runfoapprunfoappBot
mentioned this pull request
Sep 28, 2020

Closed

carlossanlop
carlossanlop
approved these changes
Oct 6, 2020
View reviewed changes
@carlossanlopcarlossanlop
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@carlossanlop
carlossanlop
commented
Oct 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
One of the CI failures is:
F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D
For example (the spanish error message says "operacion anulada" which means "aborted operation"):
System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub
added
the 
breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
label
Oct 7, 2020
@ghostghost
added
the 
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
label
Oct 7, 2020
@stephentoub
stephentoubforce-pushed
the
zlibstream
branch
2 times, most recently
from
cc8d4d6 to
bc948e8CompareOctober 8, 2020 21:20
stephentouband others
added 4 commits
October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub
merged commit d3beb60
into
dotnet:masterOct 9, 2020
@stephentoub
stephentoub
deleted the

zlibstream

branch
October 9, 2020 10:12

This was referenced Oct 12, 2020

Closed


Closed

@JamesNKJamesNK
mentioned this pull request
Nov 9, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 7, 2020
@stephentoubstephentoub
removed

breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
labels
Sep 30, 2021
@karelz
karelz
commented
Oct 4, 2021

Copy link


Copy Markdown

Member
@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?

And there is no impact on server it seems ...
@stephentoub
stephentoub
commented
Oct 4, 2021

Copy link


Copy Markdown

MemberAuthor
is that because you implemented the detection that accepts both?
Correct.
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj approved these changes

+2 more reviewers

@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects


None yet


Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly

Add support for zlib data format (RFC 1950)


6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement ZLibStream and fix SocketsHttpHandler deflate support by stephentoub · Pull Request #42717 · dotnet/runtime · GitHub
Skip to content
Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717
Merged
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Oct 9, 2020
Merged
Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Conversation
@stephentoub
@stephentoubstephentoub
commented
Sep 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"
Fixes#2236
Fixes#38022

(This completes the commit from #2236 (comment).)
The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.
cc: @ericstj@carlossanlop@geoffkizer
@Dotnet-GitSync-Bot
Dotnet-GitSync-Bot
commented
Sep 25, 2020

Copy link


Copy Markdown

Collaborator
Note regarding the new-api-needs-documentation label:
This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.
@ghost
ghost
commented
Sep 25, 2020

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.
stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
Outdated

stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@stephentoubstephentoub
added this to the 6.0.0 milestone
Sep 25, 2020
geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
Outdated

geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@runfoapprunfoappBot
mentioned this pull request
Sep 28, 2020

Closed

carlossanlop
carlossanlop
approved these changes
Oct 6, 2020
View reviewed changes
@carlossanlopcarlossanlop
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@carlossanlop
carlossanlop
commented
Oct 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
One of the CI failures is:
F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D
For example (the spanish error message says "operacion anulada" which means "aborted operation"):
System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub
added
the 
breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
label
Oct 7, 2020
@ghostghost
added
the 
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
label
Oct 7, 2020
@stephentoub
stephentoubforce-pushed
the
zlibstream
branch
2 times, most recently
from
cc8d4d6 to
bc948e8CompareOctober 8, 2020 21:20
stephentouband others
added 4 commits
October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub
merged commit d3beb60
into
dotnet:masterOct 9, 2020
@stephentoub
stephentoub
deleted the

zlibstream

branch
October 9, 2020 10:12

This was referenced Oct 12, 2020

Closed


Closed

@JamesNKJamesNK
mentioned this pull request
Nov 9, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 7, 2020
@stephentoubstephentoub
removed

breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
labels
Sep 30, 2021
@karelz
karelz
commented
Oct 4, 2021

Copy link


Copy Markdown

Member
@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?

And there is no impact on server it seems ...
@stephentoub
stephentoub
commented
Oct 4, 2021

Copy link


Copy Markdown

MemberAuthor
is that because you implemented the detection that accepts both?
Correct.
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj approved these changes

+2 more reviewers

@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects


None yet


Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly

Add support for zlib data format (RFC 1950)


6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement ZLibStream and fix SocketsHttpHandler deflate support by stephentoub · Pull Request #42717 · dotnet/runtime · GitHub
Skip to content
Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717
Merged
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Oct 9, 2020
Merged
Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Conversation
@stephentoub
@stephentoubstephentoub
commented
Sep 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"
Fixes#2236
Fixes#38022

(This completes the commit from #2236 (comment).)
The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.
cc: @ericstj@carlossanlop@geoffkizer
@Dotnet-GitSync-Bot
Dotnet-GitSync-Bot
commented
Sep 25, 2020

Copy link


Copy Markdown

Collaborator
Note regarding the new-api-needs-documentation label:
This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.
@ghost
ghost
commented
Sep 25, 2020

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.
stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
Outdated

stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@stephentoubstephentoub
added this to the 6.0.0 milestone
Sep 25, 2020
geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
Outdated

geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@runfoapprunfoappBot
mentioned this pull request
Sep 28, 2020

Closed

carlossanlop
carlossanlop
approved these changes
Oct 6, 2020
View reviewed changes
@carlossanlopcarlossanlop
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@carlossanlop
carlossanlop
commented
Oct 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
One of the CI failures is:
F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D
For example (the spanish error message says "operacion anulada" which means "aborted operation"):
System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub
added
the 
breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
label
Oct 7, 2020
@ghostghost
added
the 
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
label
Oct 7, 2020
@stephentoub
stephentoubforce-pushed
the
zlibstream
branch
2 times, most recently
from
cc8d4d6 to
bc948e8CompareOctober 8, 2020 21:20
stephentouband others
added 4 commits
October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub
merged commit d3beb60
into
dotnet:masterOct 9, 2020
@stephentoub
stephentoub
deleted the

zlibstream

branch
October 9, 2020 10:12

This was referenced Oct 12, 2020

Closed


Closed

@JamesNKJamesNK
mentioned this pull request
Nov 9, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 7, 2020
@stephentoubstephentoub
removed

breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
labels
Sep 30, 2021
@karelz
karelz
commented
Oct 4, 2021

Copy link


Copy Markdown

Member
@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?

And there is no impact on server it seems ...
@stephentoub
stephentoub
commented
Oct 4, 2021

Copy link


Copy Markdown

MemberAuthor
is that because you implemented the detection that accepts both?
Correct.
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj approved these changes

+2 more reviewers

@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects


None yet


Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly

Add support for zlib data format (RFC 1950)


6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Implement ZLibStream and fix SocketsHttpHandler deflate support by stephentoub · Pull Request #42717 · dotnet/runtime · GitHub
Skip to content
Implement ZLibStream and fix SocketsHttpHandler deflate support - #42717
Merged
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Oct 9, 2020
Merged
Implement ZLibStream and fix SocketsHttpHandler deflate support#42717
stephentoub merged 4 commits into
dotnet:masterfrom 
stephentoub:zlibstream
Conversation
@stephentoub
@stephentoubstephentoub
commented
Sep 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
  • Implements ZLibStream, exposes it in the ref, and add tests
  • Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream to make HttpClient correctly support "deflate"
Fixes#2236
Fixes#38022

(This completes the commit from #2236 (comment).)
The tests require the updated runtime-assets test data from dotnet/runtime-assets#87.
cc: @ericstj@carlossanlop@geoffkizer
@Dotnet-GitSync-Bot
Dotnet-GitSync-Bot
commented
Sep 25, 2020

Copy link


Copy Markdown

Collaborator
Note regarding the new-api-needs-documentation label:
This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.
@ghost
ghost
commented
Sep 25, 2020

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.
stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
Outdated

stephentoub
stephentoub
commented
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@stephentoubstephentoub
added this to the 6.0.0 milestone
Sep 25, 2020
geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs
Outdated

geoffkizer
geoffkizer
reviewed
Sep 25, 2020
View reviewed changes
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@runfoapprunfoappBot
mentioned this pull request
Sep 28, 2020

Closed

carlossanlop
carlossanlop
approved these changes
Oct 6, 2020
View reviewed changes
@carlossanlopcarlossanlop
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left some minor documentation suggestions to consider.
Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

Comment threadsrc/libraries/System.IO.Compression/src/System/IO/Compression/ZLibStream.cs
Outdated

@carlossanlop
carlossanlop
commented
Oct 6, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
One of the CI failures is:
F:\workspace\_work\1\s\src\libraries\Common\tests\System\Net\Http\HttpClientHandlerTest.Decompression.cs(49,55): error CS0246:
The type or namespace name 'ZLibStream' could not be found (are you missing a using directive or an assembly reference?) [F:\workspace\_work\1\s\src\libraries\System.Net.Http.WinHttpHandler\tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj]

There are also some System.Net.Http failures, not sure if related to the changes here:
https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-42717-merge-fafaa6790ef2475e97/System.Net.Http.WinHttpHandler.Functional.Tests/console.4fe9d08c.log?sv=2019-07-07&se=2020-10-21T03%3A06%3A13Z&sr=c&sp=rl&sig=D1Z9SAXIL1Cy89j83v3WxACNT1ufGuVAMvFTLlVbw%2F0%3D
For example (the spanish error message says "operacion anulada" which means "aborted operation"):
System.Net.Http.HttpRequestException : Error while copying content to a stream.
---- System.IO.IOException : The read operation failed, see inner exception.
-------- System.Net.Http.WinHttpException : Error -2147467260 calling WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, 'Operaci˘n anulada'.
Stack Trace:
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(343,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(89,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.<>c__DisplayClass4_0.<<DecompressedResponse_MethodSpecified_DecompressedContentReturned>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(96,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Threading/Tasks/TaskTimeoutExtensions.cs(124,0): at System.Threading.Tasks.TaskTimeoutExtensions.WhenAllOrAnyFailed(Task[] tasks)
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(88,0): at System.Net.Test.Common.LoopbackServer.<>c__DisplayClass13_0.<<CreateClientAndServerAsync>b__0>d.MoveNext()
--- End of stack trace from previous location ---
/_/src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs(72,0): at System.Net.Test.Common.LoopbackServer.CreateServerAsync(Func`2 funcAsync, Options options)
/_/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Decompression.cs(83,0): at System.Net.Http.Functional.Tests.HttpClientHandler_Decompression_Test.DecompressedResponse_MethodSpecified_DecompressedContentReturned(String encodingName, Func`2 compress, DecompressionMethods methods)
--- End of stack trace from previous location ---
----- Inner Stack Trace -----
/_/src/libraries/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs(63,0): at System.Threading.Tasks.RendezvousAwaitable`1.GetResult()
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpResponseStream.cs(126,0): at System.Net.Http.WinHttpResponseStream.CopyToAsyncCore(Stream destination, Byte[] buffer, CancellationToken cancellationToken)
/_/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs(339,0): at System.Net.Http.HttpClient.GetByteArrayAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
----- Inner Stack Trace -----
/_/src/coreclr/src/System.Private.CoreLib/src/System/Environment.CoreCLR.cs(96,0): at System.Environment.get_StackTrace()
/_/src/libraries/Common/src/System/Runtime/ExceptionServices/ExceptionStackTrace.cs(23,0): at System.Runtime.ExceptionServices.ExceptionStackTrace.AddCurrentStack(Exception exception)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpException.cs(58,0): at System.Net.Http.WinHttpException.CreateExceptionUsingError(Int32 error, String nameOfCalledFunction)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(332,0): at System.Net.Http.WinHttpRequestCallback.OnRequestError(WinHttpRequestState state, WINHTTP_ASYNC_RESULT asyncResult)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(103,0): at System.Net.Http.WinHttpRequestCallback.RequestCallback(IntPtr handle, WinHttpRequestState state, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
/_/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs(46,0): at System.Net.Http.WinHttpRequestCallback.WinHttpCallback(IntPtr handle, IntPtr context, UInt32 internetStatus, IntPtr statusInformation, UInt32 statusInformationLength)
--- End of stack trace from AddCurrentStack ---

@stephentoubstephentoub
added
the 
breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
label
Oct 7, 2020
@ghostghost
added
the 
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
label
Oct 7, 2020
@stephentoub
stephentoubforce-pushed
the
zlibstream
branch
2 times, most recently
from
cc8d4d6 to
bc948e8CompareOctober 8, 2020 21:20
stephentouband others
added 4 commits
October 8, 2020 21:54
@stephentoub
Implement ZLibStream and fix SocketsHttpHandler deflate support
fc2cbea
- Implements ZLibStream, exposes it in the ref, and add tests
- Fixes SocketsHttpHandler to use ZLibStream instead of DeflateStream
@stephentoub
Add comment about deflate content encoding
b72c7c7
@stephentoub@carlossanlop
Apply suggestions from code review
87c2fe4
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
@stephentoub
Fix netfx build
cb7442a
@stephentoub
stephentoub
merged commit d3beb60
into
dotnet:masterOct 9, 2020
@stephentoub
stephentoub
deleted the

zlibstream

branch
October 9, 2020 10:12

This was referenced Oct 12, 2020

Closed


Closed

@JamesNKJamesNK
mentioned this pull request
Nov 9, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 7, 2020
@stephentoubstephentoub
removed

breaking-change
Issue or PR that represents a breaking API or functional change over a previous release.
needs-breaking-change-doc-created
Breaking changes need an issue opened with https://github.com/dotnet/docs/issues/new?template=dotnet
labels
Sep 30, 2021
@karelz
karelz
commented
Oct 4, 2021

Copy link


Copy Markdown

Member
@stephentoub you removed the breaking change labels ... is that because you implemented the detection that accepts both?

And there is no impact on server it seems ...
@stephentoub
stephentoub
commented
Oct 4, 2021

Copy link


Copy Markdown

MemberAuthor
is that because you implemented the detection that accepts both?
Correct.
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj approved these changes

+2 more reviewers

@geoffkizergeoffkizergeoffkizer approved these changes
@carlossanlopcarlossanlopcarlossanlop approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephentoubstephentoub

Labels

area-System.Net.Httpnew-api-needs-documentation

Projects


None yet


Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

HttpClient doesn't decompress "deflate" correctly

Add support for zlib data format (RFC 1950)


6 participants

@stephentoub@Dotnet-GitSync-Bot@carlossanlop@karelz@ericstj@geoffkizer