Permalink
Browse files

Merge pull request #3568 from bfolkens/master-url_subdomain_with_nume…

…ric_host

Fix trouble using :subdomain in development environment when using numeric addresses.
  • Loading branch information...
2 parents 1347665 + bd559b0 commit 34f61f8b1ddf24e3dcc45b10536fff8eb46b3063 @josevalim josevalim committed Nov 8, 2011
Showing with 12 additions and 1 deletion.
  1. +1 −1 actionpack/lib/action_dispatch/http/url.rb
  2. +11 −0 actionpack/test/controller/url_for_test.rb
View
2 actionpack/lib/action_dispatch/http/url.rb
@@ -64,7 +64,7 @@ def rewrite_authentication(options)
end
def host_or_subdomain_and_domain(options)
- return options[:host] if options[:subdomain].nil? && options[:domain].nil?
+ return options[:host] if !named_host?(options[:host]) || (options[:subdomain].nil? && options[:domain].nil?)
tld_length = options[:tld_length] || @@tld_length
View
11 actionpack/test/controller/url_for_test.rb
@@ -16,6 +16,10 @@ def add_host!
W.default_url_options[:host] = 'www.basecamphq.com'
end
+ def add_numeric_host!
+ W.default_url_options[:host] = '127.0.0.1'
+ end
+
def test_exception_is_thrown_without_host
assert_raise ArgumentError do
W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
@@ -81,6 +85,13 @@ def test_multiple_subdomains_may_be_removed
)
end
+ def test_subdomain_may_be_accepted_with_numeric_host
+ add_numeric_host!
+ assert_equal('http://127.0.0.1/c/a/i',
+ W.new.url_for(:subdomain => 'api', :controller => 'c', :action => 'a', :id => 'i')
+ )
+ end
+
def test_domain_may_be_changed
add_host!
assert_equal('http://www.37signals.com/c/a/i',

0 comments on commit 34f61f8

Please sign in to comment.