nahi	2011-07-25 13:51:26 +0900 (Mon, 25 Jul 2011)

  New Revision: 32663

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

  Log:
    * backport r32662 from trunk.
    
    * ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
      introduced in r30152 to x509-internal.rb.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/openssl/lib/openssl/x509-internal.rb
    branches/ruby_1_9_3/ext/openssl/lib/openssl/x509.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32662)
+++ ruby_1_9_3/ChangeLog	(revision 32663)
@@ -1,3 +1,10 @@
+Mon Jul 25 13:50:33 2011  Hiroshi Nakamura  <nahi@r...>
+
+	* backport r32662 from trunk.
+
+	* ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
+	  introduced in r30152 to x509-internal.rb.
+
 Mon Jul 25 13:35:20 2011  Hiroshi Nakamura  <nahi@r...>
 
 	* backport r32658 from trunk.
Index: ruby_1_9_3/ext/openssl/lib/openssl/x509-internal.rb
===================================================================
--- ruby_1_9_3/ext/openssl/lib/openssl/x509-internal.rb	(revision 32662)
+++ ruby_1_9_3/ext/openssl/lib/openssl/x509-internal.rb	(revision 32663)
@@ -148,5 +148,11 @@
         alias parse parse_openssl
       end
     end
+
+    class StoreContext
+      def cleanup
+        warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
+      end
+    end
   end
 end
Index: ruby_1_9_3/ext/openssl/lib/openssl/x509.rb
===================================================================
--- ruby_1_9_3/ext/openssl/lib/openssl/x509.rb	(revision 32662)
+++ ruby_1_9_3/ext/openssl/lib/openssl/x509.rb	(revision 32663)
@@ -1,9 +1 @@
-module OpenSSL
-  module X509
-    class StoreContext
-      def cleanup
-        warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
-      end
-    end
-  end
-end
+require 'openssl'

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