From edf712bfd8fcc44cf55232cd5f6eaec32f69ae2e Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 26 Jul 2015 10:21:35 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ ext/openssl/ossl_ssl.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6d7bbe78a6..647e09d1e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 26 19:21:31 2015 Nobuyoshi Nakada + + * 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 * 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