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

in_http: Add support for subdomain in CORS domain #2337

Merged
merged 2 commits into from
Mar 22, 2019

Conversation

hirokikana
Copy link
Contributor

Signed-off-by: Hiroki Takayasu [email protected]

Which issue(s) this PR fixes:
#2336

What this PR does / why we need it:
Currently cors_allow_origins could only use * or exact matching. I modified able to could use wildcard in domain setting(ex: http://*.example.com )

Docs Changes:
No need

Release Note:
See PR title

return true
end
filtered_cors_allow_origins = @cors_allow_origins.select {|origin| origin != ""}
return filtered_cors_allow_origins.find {|origin| (start_str,end_str) = origin.split("*",2); @origin.start_with?(start_str) and @origin.end_with?(end_str)} != nil
Copy link
Member

Choose a reason for hiding this comment

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

Could you separate this one liner block into multiple lines?
By default, fluentd code doesn't use ; to force one line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for your review.
The contents pointed out were fixed. Do I need to git rebase -i ?

@hirokikana hirokikana force-pushed the in-http-cors-subdomain branch from 1345395 to def7c91 Compare March 20, 2019 14:44
@repeatedly repeatedly merged commit f653461 into fluent:master Mar 22, 2019
@repeatedly
Copy link
Member

Thanks!

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.

2 participants