aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_process.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-08-31 19:03:42 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-08-31 19:03:42 +0000
commit33e5e41ddaf59bc9c08e4d9eb34d52174bf05114 (patch)
tree82ba138ac1d2652bc88f65c81ed2efbc16574e7c /actionpack/lib/action_controller/cgi_process.rb
parent55efae2387b0542e6f943f8a3d50290c7b06ae80 (diff)
downloadrails-33e5e41ddaf59bc9c08e4d9eb34d52174bf05114.tar.gz
rails-33e5e41ddaf59bc9c08e4d9eb34d52174bf05114.tar.bz2
rails-33e5e41ddaf59bc9c08e4d9eb34d52174bf05114.zip
request.host works with IPv6 addresses. Closes #9458.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7382 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index fa7afd4197..6e8098e746 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -92,7 +92,7 @@ module ActionController #:nodoc:
end
def host
- host_with_port[/^[^:]+/]
+ host_with_port.sub(/:\d+$/, '')
end
def port