From 1270660bf1b1262c4fcb852106a91c720277988a Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 26 Oct 2017 15:29:36 +0000 Subject: Host header should add branckets to IPv6 address [Bug #12642] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/http.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/net/http.rb b/lib/net/http.rb index 0fec32bb84..90f299f705 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1612,11 +1612,10 @@ module Net #:nodoc: private def addr_port - if use_ssl? - address() + (port == HTTP.https_default_port ? '' : ":#{port()}") - else - address() + (port == HTTP.http_default_port ? '' : ":#{port()}") - end + addr = address + addr = "[#{addr}]" if addr.include?(":") + default_port = use_ssl? ? HTTP.https_default_port : HTTP.http_default_port + default_port == port ? addr : "#{addr}:#{port}" end def D(msg) -- cgit v1.2.3