Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make Request#subdomains handle "foo.foo.com" correctly

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 847f738cfd8acf5db065cd9bb1ca3d47a7676fa3 1 parent fae7311
@jamis jamis authored
View
4 actionpack/CHANGELOG
@@ -1,3 +1,7 @@
+*SVN*
+
+* Fixed Request#subdomains to handle "foo.foo.com" correctly
+
*1.9.1* (11 July, 2005)
* Fixed that auto_complete_for didn't force the input string to lower case even as the db comparison was
View
2  actionpack/lib/action_controller/request.rb
@@ -116,7 +116,7 @@ def domain(tld_length = 1)
# in "www.rubyonrails.co.uk".
def subdomains(tld_length = 1)
parts = host.split('.')
- parts - parts.last(1 + tld_length)
+ parts[0..-(tld_length+2)]
end
# Receive the raw post data.
View
3  actionpack/test/controller/request_test.rb
@@ -55,6 +55,9 @@ def test_subdomains
@request.host = "dev.www.rubyonrails.co.uk"
assert_equal %w( dev www ), @request.subdomains(2)
+
+ @request.host = "foobar.foobar.com"
+ assert_equal %w( foobar ), @request.subdomains
end
def test_port_string
Please sign in to comment.
Something went wrong with that request. Please try again.