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

nsqd: fix -tls-required=tcp-https with -tls-client-auth-policy #557

Merged
merged 2 commits into from
Mar 12, 2015
Merged

nsqd: fix -tls-required=tcp-https with -tls-client-auth-policy #557

merged 2 commits into from
Mar 12, 2015

Conversation

twmb
Copy link
Contributor

@twmb twmb commented Mar 11, 2015

Previously, specifying -tls-client-auth-policy would set -tls-required to
TLSRequired, overriding TLSRequiredExceptHTTP if it was specified.

Now, specifying the policy only sets TLSRequired if the current option is
TLSNotRequired.

twmb added 2 commits March 11, 2015 16:10
Previously, specifying -tls-client-auth-policy would set -tls-required to
TLSRequired, overriding TLSRequiredExceptHTTP if it was specified.

Now, specifying the policy only sets TLSRequired if the current option is
TLSNotRequired.
This copies the test prior, TestHTTPSRequireVerify, but allows HTTP and tests
only against HTTP.
@mreiferson
Copy link
Member

Nice, thanks!

mreiferson added a commit that referenced this pull request Mar 12, 2015
nsqd: fix -tls-required=tcp-https with -tls-client-auth-policy
@mreiferson mreiferson merged commit 831c218 into nsqio:master Mar 12, 2015
@mreiferson mreiferson added the bug label Mar 12, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants