naruse	2012-02-08 20:47:47 +0900 (Wed, 08 Feb 2012)

  New Revision: 34491

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

  Log:
    merge revision(s) 34490: [Backport #5983]
    ------------------------------------------------------------------------
    r34490 | naruse | 2012-02-08 20:47:00 +0900 (Wed, 08 Feb 2012) | 1 line
    
    Fix condition.
    ------------------------------------------------------------------------

  Modified files:
    branches/ruby_1_9_3/test/openssl/test_x509name.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34490)
+++ ruby_1_9_3/version.h	(revision 34491)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 66
+#define RUBY_PATCHLEVEL 67
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/openssl/test_x509name.rb
===================================================================
--- ruby_1_9_3/test/openssl/test_x509name.rb	(revision 34490)
+++ ruby_1_9_3/test/openssl/test_x509name.rb	(revision 34491)
@@ -311,7 +311,7 @@
   end
 
   def test_add_entry_street
-    return if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x009080df # 0.9.8m
+    return if OpenSSL::OPENSSL_VERSION_NUMBER < 0x009080df # 0.9.8m
     # openssl/crypto/objects/obj_mac.h 1.83
     dn = [
       ["DC", "org"],

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