shyouhei	2011-12-10 21:17:23 +0900 (Sat, 10 Dec 2011)

  New Revision: 33999

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

  Log:
    merge revision(s) 27064:
    
    * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
      store->ex_data.sk.  [ruby-core:28907] [ruby-core:23971]
      [ruby-core:18121]
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/openssl/ossl_x509store.c

Index: ruby_1_8_7/ext/openssl/ossl_x509store.c
===================================================================
--- ruby_1_8_7/ext/openssl/ossl_x509store.c	(revision 33998)
+++ ruby_1_8_7/ext/openssl/ossl_x509store.c	(revision 33999)
@@ -131,6 +131,7 @@
 
 /* BUG: This method takes any number of arguments but appears to ignore them. */
     GetX509Store(self, store);
+    store->ex_data.sk = NULL;
     X509_STORE_set_verify_cb_func(store, ossl_verify_cb);
     ossl_x509store_set_vfy_cb(self, Qnil);
 
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 33998)
+++ ruby_1_8_7/ChangeLog	(revision 33999)
@@ -1,3 +1,9 @@
+Mon Oct 17 03:56:12 2011  Yusuke Endoh  <mame@t...>
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
+	  store->ex_data.sk.  [ruby-core:28907] [ruby-core:23971]
+	  [ruby-core:18121]
+
 Thu Jun 30 12:52:56 2011  WATANABE Hirofumi  <eban@r...>
 
 	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.

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