Skip to content

Remove ifdef check for an OpenSSL version (0.9.6) we don't support #6800

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
Merged
merged 1 commit into from
May 14, 2018
Merged

Remove ifdef check for an OpenSSL version (0.9.6) we don't support #6800

merged 1 commit into from
May 14, 2018

Conversation

alex
Copy link
Member

@alex alex commented May 14, 2018

No description provided.

@alex alex requested a review from tiran May 14, 2018 14:37
@alex alex merged commit f042242 into master May 14, 2018
@miss-islington
Copy link
Contributor

Thanks @alex for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@alex alex deleted the alex-patch-1 branch May 14, 2018 15:51
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 14, 2018
@alex @miss-islington
Remove ifdef check for an OpenSSL version (0.9.6) we don't support (p…
c9bd979 
…ythonGH-6800)

(cherry picked from commit f042242)

Co-authored-by: Alex Gaynor <[email protected]>
@serhiy-storchaka
Copy link
Member

Compiler warning:

/home/serhiy/py/cpython/Modules/_ssl.c: In function ‘newPySSLSocket’:
/home/serhiy/py/cpython/Modules/_ssl.c:885:10: warning: unused variable ‘mode’ [-Wunused-variable]
     long mode;
          ^~~~

@miss-islington
Copy link
Contributor

Thanks @alex for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@alex
Copy link
Member Author

alex commented May 14, 2018

@serhiy-storchaka Good catch thanks -- should we be using -Werror or something in CI?

alex added a commit that referenced this pull request May 14, 2018
@alex
Fixed an unused variable warning introduced in GH-6800
d8486c9
@serhiy-storchaka
Copy link
Member

There are several compiler warnings produced on different platforms, especially on non-master branches.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 14, 2018
@alex @miss-islington
Fixed an unused variable warning introduced in pythonGH-6800 (pythonG…
a8bf2a8 
…H-6816)

(cherry picked from commit 00717a4)

Co-authored-by: Alex Gaynor <[email protected]>
alex added a commit that referenced this pull request May 14, 2018
@alex
Fixed an unused variable warning introduced in GH-6800 (GH-6816)
00717a4
miss-islington added a commit that referenced this pull request May 14, 2018
@miss-islington @alex
Fixed an unused variable warning introduced in GH-6800 (GH-6816)
3b26e8c 
(cherry picked from commit 00717a4)

Co-authored-by: Alex Gaynor <[email protected]>
@Mariatta
Copy link
Member

Mariatta commented Jul 30, 2018 •
edited
Loading

I'm a little confused here. Has the backport to 3.7 been done? Where is the PR for it so I can remove the needs backport to 3.7 label.

@miss-islington
Copy link
Contributor

Thanks @alex for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @alex, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker f04224210d93212bd9ad17d67ef5e1c70171a13e 3.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

Assignees

@alex alex

Labels
skip issue skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@alex @miss-islington @serhiy-storchaka @Mariatta @tiran @the-knights-who-say-ni @bedevere-bot