summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-20 04:49:40 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-20 04:49:40 +0000
commit4c426290d65d43e54c69a5ca469ba6a4e8ec1133 (patch)
tree7da07fb440a005c816164b20ade37e8e970e01f2
parentd6ea20ff492df58afcc5a7d83898b1a08bb25556 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/net/http.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb
index c2d33018a2..e3b5619e8a 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -22,9 +22,9 @@
require_relative 'protocol'
require 'uri'
+autoload :OpenSSL, 'openssl'
module Net #:nodoc:
- autoload :OpenSSL, 'openssl'
# :stopdoc:
class HTTPBadResponse < StandardError; end
diff --git a/version.h b/version.h
index b0a0ccb9b9..1d9180d1d9 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.4"
#define RUBY_RELEASE_DATE "2019-01-20"
-#define RUBY_PATCHLEVEL 132
+#define RUBY_PATCHLEVEL 133
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1