From 22c6764a006a5863c3bc24f3f365e6963d65ca44 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 31 Jan 2021 09:45:23 +0000
Subject: [PATCH] change the order of of SERVER_CERT and CA_CERT for OpenSSL
 1.1.1

[backport #17501]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/net/http/test_https.rb |  2 +-
 version.h                   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb
index 3a23410241..784f002c22 100644
--- a/test/net/http/test_https.rb
+++ b/test/net/http/test_https.rb
@@ -45,7 +45,7 @@ class TestNetHTTPS < Test::Unit::TestCase
       assert_equal($test_net_http_data, res.body)
     }
     # TODO: OpenSSL 1.1.1h seems to yield only SERVER_CERT; need to check the incompatibility
-    certs.zip([SERVER_CERT, CA_CERT]) do |actual, expected|
+    certs.zip([CA_CERT, SERVER_CERT]) do |actual, expected|
       assert_equal(expected.to_der, actual.to_der)
     end
   rescue SystemCallError
diff --git a/version.h b/version.h
index 83cdb05fd4..f92fbfd14a 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.6.7"
-#define RUBY_RELEASE_DATE "2020-12-09"
-#define RUBY_PATCHLEVEL 150
+#define RUBY_RELEASE_DATE "2021-01-31"
+#define RUBY_PATCHLEVEL 151
 
-#define RUBY_RELEASE_YEAR 2020
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_YEAR 2021
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"