8000 merge revision(s) 64b6a018a38f200c957fdbbe7d0cbe0e64781c9f: · ruby/ruby@0a2238d · GitHub
[go: up one dir, main page]

Skip to content

Commit 0a2238d

Browse files
committed
merge revision(s) 64b6a01:
Fix test session reuse but expire (#9824) * OpenSSL 3.2.1 30 Jan 2024 is also broken Import 4506461 from ruby_3_3 branch tentatively. --- test/net/http/test_https.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
1 parent b12343c commit 0a2238d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

test/net/http/test_https.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def test_session_reuse
167167
def test_session_reuse_but_expire
168168
# FIXME: The new_session_cb is known broken for clients in OpenSSL 1.1.0h.
169169
omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 1.1.0h')
170-
omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 3.2.0')
170+
omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 3.2.')
171171

172172
http = Net::HTTP.new(HOST, config("port"))
173173
http.use_ssl = true

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
1212
#define RUBY_VERSION_TEENY 3
1313
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
14-
#define RUBY_PATCHLEVEL 160
14+
#define RUBY_PATCHLEVEL 161
1515

1616
#include "ruby/version.h"
1717
#include "ruby/internal/abi.h"

0 commit comments

Comments
 (0)
0