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

Remove accept_nonblock.rb, add test_integration_ssl.rb #2448

Merged
merged 1 commit into from
Oct 25, 2020

Conversation

MSP-Greg
Copy link
Member

Description

accept_nonblock.rb has existed since Puma's SSL implementation used Ruby OpenSSL classes and objects. It has since removed those, and only uses the OpenSSL libraries.

Remove the file, as it is no longer needed. It loaded openssl, and that is also unneeded on MRI Rubies.

Add a new 'ssl' test file that starts a Puma server using IO.popen, which decouples the CI environment and what it has loaded. The test is run on all platforms.

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] or [ci skip] to the pull request title.
  • I have added appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

lib/puma/binder.rb Outdated Show resolved Hide resolved
@nateberkopec nateberkopec added maintenance waiting-for-changes Waiting on changes from the requestor labels Oct 25, 2020
@nateberkopec nateberkopec merged commit 09be7ce into puma:master Oct 25, 2020
@MSP-Greg MSP-Greg deleted the accept-nonblock branch October 25, 2020 22:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance waiting-for-changes Waiting on changes from the requestor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants