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

Fix server_name_indication disable value #8737

Merged
merged 1 commit into from
Sep 9, 2024

Conversation

aaronrenner
Copy link
Contributor

The docs both reference disabled and disable as a valid value for server_name_indicator. However when looking at this case statement, it's matching on disable not disabled.

otp/lib/ssl/src/ssl.erl

Lines 4194 to 4199 in 44a56d6

SNI = case get_opt(server_name_indication, unbound, UserOpts, Opts) of
{_, unbound} -> server_name_indication_default(maps:get(host, Env, undefined));
{_, [_|_] = SN} -> SN;
{_, disable} -> disable;
{_, SN} -> option_error(server_name_indication, SN)
end,

This updates the typespec to indicate the expected value is disable.

@CLAassistant
Copy link

CLAassistant commented Aug 20, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

github-actions bot commented Aug 20, 2024

CT Test Results

    2 files     67 suites   48m 41s ⏱️
  791 tests   747 ✅  44 💤 0 ❌
3 760 runs  2 966 ✅ 794 💤 0 ❌

Results for commit faea255.

♻️ This comment has been updated with latest results.

To speed up review, make sure that you have read Contributing to Erlang/OTP and that all checks pass.

See the TESTING and DEVELOPMENT HowTo guides for details about how to run test locally.

Artifacts

// Erlang/OTP Github Action Bot

@rickard-green rickard-green added the team:PS Assigned to OTP team PS label Aug 26, 2024
@IngelaAndin IngelaAndin self-assigned this Aug 27, 2024
@IngelaAndin
Copy link
Contributor

@aaronrenner Could you please rebase this on maint so that the documentation can be fixed in OTP-27 track and not have to wait for OTP-28

@IngelaAndin IngelaAndin added the waiting waiting for changes/input from author label Sep 3, 2024
@aaronrenner aaronrenner changed the base branch from master to maint September 9, 2024 15:24
@aaronrenner
Copy link
Contributor Author

@IngelaAndin I just rebased on top of maint. Please let me know if there's anything else you need.

@IngelaAndin IngelaAndin removed the waiting waiting for changes/input from author label Sep 9, 2024
@IngelaAndin IngelaAndin merged commit 2239150 into erlang:maint Sep 9, 2024
3 checks passed
@IngelaAndin
Copy link
Contributor

Thanks for the PR, merged for OTP-27.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team:PS Assigned to OTP team PS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants