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.

Sign up for GitHub

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

Jump to bottom

Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition #1355

Merged
merged 1 commit into from
May 2, 2017
Merged

Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition #1355

merged 1 commit into from
May 2, 2017

Conversation

njsmith
Copy link
Contributor

@njsmith njsmith commented Apr 29, 2017

It was confusing that PROTOCOL_SSLv23 could negotiate TLS connections. It is not confusing that PROTOCOL_TLS can negotiate TLS connections. In fact it is confusing that the docs thought it was confusing.

@njsmith
Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS …
110ad17 
…transition

It was confusing that PROTOCOL_SSLv23 could negotiate TLS connections. It is not confusing that PROTOCOL_TLS can negotiate TLS connections. In fact it is confusing that the docs thought it was confusing.
@mention-bot
Copy link

@njsmith, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dstufft, @Yhg1s and @tiran to be potential reviewers.

@njsmith
Copy link
Contributor Author

njsmith commented Apr 29, 2017

(This should have the "trivial" label, but I don't have permissions to add it.)

tiran
tiran approved these changes Apr 29, 2017
View reviewed changes
Copy link
Member

@tiran tiran left a comment

Choose a reason for hiding this comment

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

LGTM

SSLv23 is an artefact from the time when OpenSSL just had support for SSLv2 and SSLv3. It took me years do understand that PROTOCOL_SSLv23 actually means auto-negotiation of the highest protocol enabled on both sides.

@tiran tiran added docs Documentation in the Doc dir trivial labels Apr 29, 2017
@Mariatta Mariatta merged commit d4069de into python:master May 2, 2017
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request May 2, 2017
@njsmith @Mariatta
[3.6] Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCO…
2a55ce4 
…L_TLS transition (pythonGH-1355)

(cherry picked from commit d4069de)
@Mariatta Mariatta mentioned this pull request May 2, 2017
Merged
Mariatta added a commit that referenced this pull request May 2, 2017
@Mariatta
[3.6] Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCO…
78b23ab 
…L_TLS transition (GH-1355) (#1371)

(cherry picked from commit d4069de)
@miss-islington
Copy link
Contributor

Thanks @njsmith for the PR, and @Mariatta for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @njsmith and @Mariatta, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker d4069de5112f0408801ff2479476827bb3e0e8fc 2.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tiran tiran tiran approved these changes

@Mariatta Mariatta Mariatta approved these changes

Assignees

@Mariatta Mariatta

Labels
docs Documentation in the Doc dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@njsmith @mention-bot @miss-islington @tiran @Mariatta @the-knights-who-say-ni