aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGuilherme Cavalcanti <guiocavalcanti@gmail.com>2014-05-09 15:52:10 -0300
committerAndrew White <andyw@pixeltrix.co.uk>2014-05-11 12:59:37 +0100
commitbe93d94ef28421a2dbcd6ed870b454433a5a0a72 (patch)
tree145c7211fe35e5cb305b6013733495322bebdb86 /actionpack/lib
parentadcba34c57adba61bfaf45296a6dc707c8338b99 (diff)
downloadrails-be93d94ef28421a2dbcd6ed870b454433a5a0a72.tar.gz
rails-be93d94ef28421a2dbcd6ed870b454433a5a0a72.tar.bz2
rails-be93d94ef28421a2dbcd6ed870b454433a5a0a72.zip
ActionDispatch::Http::URL.normalize_port should not strip port for protocol relative URL.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/http/url.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 278f534380..77ea0cf658 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -135,8 +135,6 @@ module ActionDispatch
return nil if options[:port].nil? || options[:port] == false
case options[:protocol]
- when "//"
- nil
when "https://"
options[:port].to_i == 443 ? nil : options[:port]
else