kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/net/http.rb: don't use autoload.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-06-06 01:53:41 +00:00
parent 55ea66cb11
commit 80651edad2
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Jun 6 10:52:13 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb: don't use autoload.
Mon Jun 6 09:39:43 2011 Aaron Patterson <aaron@tenderlovemaking.com> Mon Jun 6 09:39:43 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/parser.c (parse): release event objects to plug memory * ext/psych/parser.c (parse): release event objects to plug memory

10
lib/net/http.rb
View file

@ -20,9 +20,7 @@
# #
require 'net/protocol' require 'net/protocol'
autoload :OpenSSL, 'openssl'
require 'uri' require 'uri'
autoload :SecureRandom, 'securerandom'
module Net #:nodoc: module Net #:nodoc:
@ -545,7 +543,10 @@ module Net #:nodoc:
http = new(address, port, p_addr, p_port, p_user, p_pass) http = new(address, port, p_addr, p_port, p_user, p_pass)
if opt if opt
opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl] if opt[:use_ssl]
require 'openssl' unless defined?(OpenSSL)
opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt)
end
http.methods.grep(/\A(\w+)=\z/) do |meth| http.methods.grep(/\A(\w+)=\z/) do |meth|
key = $1.to_sym key = $1.to_sym
opt.key?(key) or next opt.key?(key) or next
@ -656,6 +657,7 @@ module Net #:nodoc:
# Returns true if SSL/TLS is being used with HTTP. # Returns true if SSL/TLS is being used with HTTP.
def use_ssl? def use_ssl?
require 'openssl' unless defined?(OpenSSL)
@use_ssl @use_ssl
end end
@ -1961,6 +1963,7 @@ module Net #:nodoc:
end end
opt = @form_option.dup opt = @form_option.dup
require 'securerandom' unless defined?(SecureRandom)
opt[:boundary] ||= SecureRandom.urlsafe_base64(40) opt[:boundary] ||= SecureRandom.urlsafe_base64(40)
self.set_content_type(self.content_type, boundary: opt[:boundary]) self.set_content_type(self.content_type, boundary: opt[:boundary])
if chunked? if chunked?
@ -1981,6 +1984,7 @@ module Net #:nodoc:
def encode_multipart_form_data(out, params, opt) def encode_multipart_form_data(out, params, opt)
charset = opt[:charset] charset = opt[:charset]
boundary = opt[:boundary] boundary = opt[:boundary]
require 'securerandom' unless defined?(SecureRandom)
boundary ||= SecureRandom.urlsafe_base64(40) boundary ||= SecureRandom.urlsafe_base64(40)
chunked_p = chunked? chunked_p = chunked?