summaryrefslogtreecommitdiff
path: root/lib/net
diff options
context:
space:
mode:
Diffstat (limited to 'lib/net')
-rw-r--r--lib/net/http.rb9
1 files changed, 4 insertions, 5 deletions
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)