diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-26 10:21:35 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-26 10:21:35 +0000 |
| commit | edf712bfd8fcc44cf55232cd5f6eaec32f69ae2e (patch) | |
| tree | c2982cba5a1a4d0068a8606ca132a8c7ac684c76 | |
| parent | 288f6e1b898681a0f4385ed9fd2c73f405e968d9 (diff) | |
| download | ruby-edf712bfd8fcc44cf55232cd5f6eaec32f69ae2e.tar.gz | |
ossl_ssl.c: fix condition
* ext/openssl/ossl_ssl.c (ossl_ssl_alpn_protocol): fix condition
to compile, needs ALPN to be available. [Feature #9390]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sun Jul 26 19:21:31 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/ossl_ssl.c (ossl_ssl_alpn_protocol): fix condition + to compile, needs ALPN to be available. [Feature #9390] + Sun Jul 26 11:29:01 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * signal.c (default_handler, Init_signal): discard SIGSYS, ENOSYS diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 60ed9e033e..9fe33773db 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1932,7 +1932,9 @@ ossl_ssl_npn_protocol(VALUE self) else return rb_str_new((const char *) out, outlen); } +# endif +# ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB /* * call-seq: * ssl.alpn_protocol => String |