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

Dev/ssl cipher support #1478

Merged
merged 4 commits into from
May 9, 2018
Merged

Conversation

eallison91
Copy link

Allows optional specifying of which ssl ciphers the server should support. Default behavior is unchanged.

Created from #1476 which was inadvertently closed.

def test_binder_parses_jruby_ssl_options
skip unless Puma.jruby?

keystore = File.expand_path "../../examples/puma/keystore.jks"
Copy link

Choose a reason for hiding this comment

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

missing ", FILE" from end of line

@eallison91
Copy link
Author

#996

@eallison91
Copy link
Author

Any update here? Many of the failures do not appear to be related to my changes and I'd like to resolve this.

If there's a way to run the travis and/or appveyor tests locally, I would welcome any information on it. At this point, all tests pass locally.

@nateberkopec
Copy link
Member

Thanks for the PR. I'm taking some time off during the holidays and probably won't be able to merge until 2018.

@t3spe
Copy link

t3spe commented Mar 9, 2018

any update on this?

@arzavj
Copy link

arzavj commented Mar 26, 2018

Would love to see this in soon too!

@skrobul skrobul mentioned this pull request Apr 16, 2018
@evanphx
Copy link
Member

evanphx commented May 9, 2018

The Travis errors appear to be from the compiler being updated, we'll need to fix those but this PR didn't cause that.

@evanphx evanphx merged commit e4255d0 into puma:master May 9, 2018
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.

None yet

6 participants