Merge upstream/master into fork history (fixes behind-counter)#18
Merged
Conversation
Propagate keep alive settings from the config
This small commits conditionally sets TCP BBR as a preferrable algorithm for TCP congestion control
Use TCP BBR in a best-effort mode
Add TCP_USER_TIMEOUT support
Add TCP_NOTSENT_LOWAT setting
… TCP_USER_TIMEOUT, TCP_NOTSENT_LOWAT, sockopts refactor)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The previous cherry-pick PR (#17) applied the same content but with different commit SHAs, so GitHub still showed the fork as 9 commits behind upstream.
This PR merges
upstream/masterdirectly so the fork's commit graph includes the original upstream SHAs (PRs 9seconds#451–9seconds#454). After merge the fork will be 0 commits behind.No new code changes — content is identical to #17.