Merge Velocity-CTD libdeflate (986267317) - #28
Open
github-actions[bot] wants to merge 5 commits into
Open
github-actions[bot] wants to merge 5 commits into
github-actions[bot] wants to merge 5 commits into
Conversation
* Per-forced-host motd, motd-hover and server-icon * Fix comment not migrating * Fix NPE for legacy (1.3-1.5) clients that don't send a virtual host --- Co-Authored-By: TheOne_Player <TheOne_Player@hotmail.com>
The counter stored one entry per addTime call, so a client sending tiny (even empty) packets could grow it without limit while staying under the bytes-per-second limit, eventually OOMing the proxy. Merge data points within 1ms of the newest one so the entry count is bounded by the window size (~7000 for the default 7s window) rather than by packet rate.
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
1 participant
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.
Merges
libdeflateat9862673172a34a01366c0ff19cbf34a8afa65593, 4 commits ahead of main.The merge applied cleanly and
./gradlew buildpassed on the result.Worth a look before merging: ApiaryProxy carries branding, the
remove-reconfigandkeep-client-world-on-switchoptions, and its own workflows. A clean merge does not prove upstream did not change behaviour underneath those.