diff options
| -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 |