-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
in_forward: Use full width of gzip header for checking whether concatenated or not #9139
Conversation
src/flb_gzip_concatenated.c
Outdated
return count; | ||
} | ||
|
||
size_t flb_gzip_concatenated_borders(const char *data, size_t len, size_t **out_borders, size_t border_count) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since this function does pretty much the same than _count plus setting up the borders, I suggest to merge both and make **out_borders optional, e.g: if set, write the borders on it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for your suggestion.
Fixed at dcc9ca5.
src/flb_gzip_concatenated.c
Outdated
return FLB_FALSE; | ||
} | ||
|
||
size_t flb_gzip_concatenated_count(const char *data, size_t len) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rename to flb_gzip_count() and merge it on flb_gzip.c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done by dcc9ca5.
CentOS 7 failure on CI will be fixed by #9157. |
@cosmo0920 to merge this, let's remove the number of commits since half of them are around initial implementation, so we just keep the last ones |
Sure, I'll concatenated into one commit. |
e18cc86
to
cad1bea
Compare
I squashed my commits into one commit. |
Signed-off-by: Hiroshi Hatake <[email protected]>
Signed-off-by: Hiroshi Hatake <[email protected]>
Signed-off-by: Hiroshi Hatake <[email protected]>
cad1bea
to
4199737
Compare
I split my commit for meaningful groups of commits. |
Using for concatenated gzip conformation with magic bytes, compression method and OS flags.
Follows up for #8665.
Enter
[N/A]
in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-test
label to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.