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

Upstream sni #169

Closed
wants to merge 2 commits into from
Closed

Upstream sni #169

wants to merge 2 commits into from

Conversation

ferd
Copy link
Contributor

@ferd ferd commented Feb 15, 2017

Adding some annotations for 18.0+ options that were added to the SSL libs.

@essen
Copy link
Member

essen commented Feb 15, 2017

Something is funky in the diff. The sni options are already there (with a less precise type I suppose) and yet the diff acts like they are not. Please remove the merge commit and/or rebase.

Also the backlog and send options are TCP options. See https://github.com/heroku/ranch/blob/f4d23d7128e89efcce323df3ef1979bfa1e8e917/src/ranch_ssl.erl#L83

@ferd
Copy link
Contributor Author

ferd commented Feb 15, 2017

UH alright. I'll double check that and re-open later.

@ferd ferd closed this Feb 15, 2017
@ferd
Copy link
Contributor Author

ferd commented Feb 15, 2017

Yeah you're right, just something that really went weird in there.

@essen
Copy link
Member

essen commented Feb 15, 2017

Yeah... git is not supposed to do this. :-)

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

Successfully merging this pull request may close these issues.

None yet

2 participants