ruby-changes:54747
From: usa <ko1@a...>
Date: Thu, 31 Jan 2019 19:55:42 +0900 (JST)
Subject: [ruby-changes:54747] usa:r66964 (ruby_2_4): merge revision(s) 66401: [Backport #15412]
usa 2019-01-31 19:55:37 +0900 (Thu, 31 Jan 2019) New Revision: 66964 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66964 Log: merge revision(s) 66401: [Backport #15412] Move autoload to toplevel So that classes which uses Net::HTTP with https can use OpenSSL namespace for example exception classes like OpenSSL::SSL::SSLError. Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/lib/net/http.rb branches/ruby_2_4/version.h Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 66963) +++ ruby_2_4/version.h (revision 66964) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.6" #define RUBY_RELEASE_DATE "2019-01-31" -#define RUBY_PATCHLEVEL 339 +#define RUBY_PATCHLEVEL 340 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 1 Index: ruby_2_4/lib/net/http.rb =================================================================== --- ruby_2_4/lib/net/http.rb (revision 66963) +++ ruby_2_4/lib/net/http.rb (revision 66964) @@ -22,9 +22,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/net/http.rb#L22 require 'net/protocol' require 'uri' +autoload :OpenSSL, 'openssl' module Net #:nodoc: - autoload :OpenSSL, 'openssl' # :stopdoc: class HTTPBadResponse < StandardError; end Index: ruby_2_4 =================================================================== --- ruby_2_4 (revision 66963) +++ ruby_2_4 (revision 66964) Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r66401 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/