Adding a check to find NPN-capable OpenSSL. #2174
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
||
| int main() { | ||
| SSL_get0_next_proto_negotiated(NULL, NULL, NULL); | ||
| return OPENSSL_NPN_UNSUPPORTED; |
There was a problem hiding this comment.
This is slightly confusing but if you have a good rationale for it, that's fine. Maybe a comment...
There was a problem hiding this comment.
I don't see it. Did you push?
nicolasnoble
force-pushed
the
makefile-npn-check
branch
from
8b4c6ce
to
4cc8c8a
Compare
|
Just to make sure. Do you want me to add it to #2176? |
|
travis is red for a makefile generation issue. I'll merge when it's green. |
Conflicts: Makefile templates/Makefile.template
|
Crap, I didn't realize this still wasn't merged. And here I was, telling people around me this was done. I'm a bad person. PR has been updated. |
|
Also, @murgatroid99, have a quick look at the Makefile changes ? |
|
happy to merge but travis python is red. @nathanielmanistaatgoogle do you think it's a flake? |
|
Travis is all green now btw :-P |
jboeuf
added a commit
that referenced
this pull request
Jul 7, 2015
Adding a check to find NPN-capable OpenSSL.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Several comments:
-) We're always going to try building the embedded OpenSSL if we have it and if the system one isn't ALPN-capable.
-) I've removed the hardcoded test for the version number: this seems irrelevant now, especially since we have another check elsewhere that ensures the version of the submodule (which was the reason for that test to begin with).