tenderlove	2015-07-23 04:04:58 +0900 (Thu, 23 Jul 2015)

  New Revision: 51349

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

  Log:
    fix tests bu not setting the string instance on the frozen object
    
    OpenSSL [copies the string returned by the pointe](https://github.com/openssl/openssl/blob/9f040d6decca7930e978784c917f731e5c45e8f0/ssl/t1_lib.c#L1800-1809), so it should be safe to just return a pointer to the string object and not set an instance variable on the already frozen object.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 51348)
+++ ChangeLog	(revision 51349)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jul 23 04:03:03 2015  Aaron Patterson <tenderlove@r...>
+
+	* ext/openssl/ossl_ssl.c: fix tests by not setting the instance
+	  variable on the frozen ssl instance.
+
 Thu Jul 23 03:32:26 2015  Aaron Patterson <tenderlove@r...>
 
 	* ext/openssl/ossl_ssl.c: add ECDH callback support. [Feature #11356]
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 51348)
+++ ext/openssl/ossl_ssl.c	(revision 51349)
@@ -707,7 +707,6 @@ ssl_alpn_select_cb(SSL *ssl, const unsig https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L707
     selected = rb_funcall(cb, rb_intern("call"), 1, protocols);
     *out = (unsigned char *) StringValuePtr(selected);
     *outlen = RSTRING_LENINT(selected);
-    rb_iv_set(sslctx_obj, "@_alpn_selected", selected);
 
     return SSL_TLSEXT_ERR_OK;
 }

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