Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Kestrel 2.2 #4031

Merged
merged 2,118 commits into from
Nov 15, 2018
Merged

Merge Kestrel 2.2 #4031

merged 2,118 commits into from
Nov 15, 2018

Conversation

natemcmaster
Copy link
Contributor

This merges release/2.1 and aspnet/KestrelHttpServer release/2.2.

Nate McMaster (automated) and others added 30 commits April 30, 2018 14:51
- Making progress towards being able to use the connection objects on the client side.
[auto-updated: dependencies]
* Allow app to drain request buffer after FIN
[auto-updated: dependencies]
# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
#	src/Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs
This reverts commit fe9da3c.
* Relieve response backpressure immediately when closing socket
[auto-updated: dependencies]
- Move ProcessRequest into ParseHttpRequest (out of state machine)
- Use struct adapter for parsing
- Non-virtual calls
- RequestType to enum
- Readonly statics and early init statics
- Early init path statics
- Faster Json fall through
- CountingBufferWriter -> Smaller BufferWriter
- Pre-init date static
- Smaller WriteNumeric
halter73 and others added 21 commits October 26, 2018 10:46
- fix an issue with tests running as root on VSTS
Prior to this, only the response body counted toward the HTTP/2 response data rate. This PR aligns the HTTP/2 logic closer to the HTTP/1.x logic and measures the rate for all HTTP/2 response data.

This PR also accounts for all response bytes written, not just those that immediately induced backpressure.
This might help address #3015

This only affects rate timeouts. Normal fixed timeouts might deserve the same treatment, but that would require some additional locking to ensure we don't modify the sentinel value.
The _streams dictionary may not contain the completing stream in
OnStreamCompleted since the IsDraining flag is applied beforehand
which allows it to be removed by the request processing thread.
Prior to this change, HTTP/2 read rate limit tests would fail when the stalled read started after the test started advancing the clock.
…estrel test projects have the test logger installed
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
Copy link
Member

Choose a reason for hiding this comment

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

What changed in the sorting rules such that the base package is now last?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was manually sorting before and ran the sort lines command in VS Code. As it gets longer, manually sorting will be a pain

@natemcmaster natemcmaster merged commit 0271428 into release/2.2 Nov 15, 2018
@natemcmaster natemcmaster deleted the namc/merge-k-2.2 branch November 15, 2018 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.