-
Notifications
You must be signed in to change notification settings - Fork 24.7k
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
Fixes netty4 module's CORS config to use defaults #19874
Conversation
transport.close(); | ||
|
||
// test with default values | ||
methods = Strings.commaDelimitedListToSet(SETTING_CORS_ALLOW_METHODS.getDefault(Settings.EMPTY)); |
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.
I find tests that reuse local variables, e.g., because they are testing different setups, quite confusing. Can we break this into two tests or at least use some scoping so that it's less confusing?
It looks good, I left a comment about the test. |
@jasontedor Thanks for the review. I pushed e09791c to split the tests into two and I made a small change that enabled refactoring these tests to not create the more heavy-weight |
@abeyad There are merge conflicts now, almost surely from the integration earlier this morning of the Expect: 100-continue test. Can you merge master in, resolve the conflicts, and push to this branch? |
and `http.cors.allow-headers` when none are specified.
e09791c
to
7a9a7a1
Compare
@jasontedor I've resolved all conflicts with master, the latest has been pushed up |
LGTM. |
thanks for the review @jasontedor |
Fixes netty4 module's CORS config to use defaults for
http.cors.allow-methods
andhttp.cors.allow-headers
when none are specified. Currently, there was a bug where if no value was specified forhttp.cors.allow-methods
orhttp.cors.allow-headers
, an empty value was used instead of the actual defaults.Note that this bug does not exist in the netty3 module.