nobu	2015-07-26 19:21:35 +0900 (Sun, 26 Jul 2015)

  New Revision: 51392

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51392

  Log:
    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]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 51391)
+++ ChangeLog	(revision 51392)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Jul 26 19:21:31 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* signal.c (default_handler, Init_signal): discard SIGSYS, ENOSYS
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 51391)
+++ ext/openssl/ossl_ssl.c	(revision 51392)
@@ -1932,7 +1932,9 @@ ossl_ssl_npn_protocol(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L1932
     else
 	return rb_str_new((const char *) out, outlen);
 }
+# endif
 
+# ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
 /*
  * call-seq:
  *    ssl.alpn_protocol => String

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/