aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/ossl_ssl.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d32fc11c9..7f4112763f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 18 17:51:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/openssl/ossl_ssl.c (ossl_sslctx_attrs): add npn_select_db to
+ suppress warning: instance variable @npn_select_cb not initialized
+
Sun Sep 16 17:47:00 2012 Eric Hodel <drbrain@segment7.net>
* tool/change_maker.rb: Update svn detection for subversion 1.7's
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 86ec206121..34df7d3d01 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -72,6 +72,7 @@ static const char *ossl_sslctx_attrs[] = {
#endif
#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
"npn_protocols",
+ "npn_select_cb",
#endif
};