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/generic_request.rb (Net::HTTP::GenericRequest#exec):

Browse source 
handle req['host'] in update_uri.

* lib/net/http/generic_request.rb
  (Net::HTTP::GenericRequest#update_uri):
  use req['host'] if it is explicitly set. Even if URI is given,
  it is already used for the initial value of req['host'].
  Therefore overwritten value should be respected. [Bug #10054]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-08-05 19:10:23 +00:00
parent c165203564
commit 70a2eb6399
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/net/http/generic_request.rb
View file

@ -116,15 +116,6 @@ class Net::HTTPGenericRequest
#
def exec(sock, ver, path) #:nodoc: internal use only
if @uri
if @uri.port == @uri.default_port
# [Bug #7650] Amazon ECS API and GFE/1.3 disallow extra default port number
self['host'] = @uri.host
else
self['host'] = "#{@uri.host}:#{@uri.port}"
end
end
if @body
send_request_with_body sock, ver, path, @body
elsif @body_stream
@ -148,9 +139,9 @@ class Net::HTTPGenericRequest
klass = URI::HTTP
end
if host = @uri.host
elsif host = self['host']
if host = self['host']
host.sub!(/:.*/s, ''.freeze)
elsif host = @uri.host
else
host = addr
end