Fix a bug where host matching occurs out of order

* Closes #504
rack · Feb 7, 2013 · 60c66b5 · 60c66b5
1 parent e6b70a7
commit 60c66b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/rack/urlmap.rb b/lib/rack/urlmap.rb
@@ -13,6 +13,7 @@ module Rack
 
   class URLMap
     NEGATIVE_INFINITY = -1.0 / 0.0
+    INFINITY = 1.0 / 0.0
 
     def initialize(map = {})
       remap(map)
@@ -35,7 +36,7 @@ def remap(map)
 
         [host, location, match, app]
       }.sort_by do |(host, location, _, _)|
-        [host ? -host.size : NEGATIVE_INFINITY, -location.size]
+        [host ? -host.size : INFINITY, -location.size]
       end
     end
 

diff --git a/test/spec_urlmap.rb b/test/spec_urlmap.rb
@@ -110,7 +110,7 @@
 
     res = Rack::MockRequest.new(map).get("http://foo.org/")
     res.should.be.ok
-    res["X-Position"].should.equal "default.org"
+    res["X-Position"].should.equal "foo.org"
 
     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "example.org")
     res.should.be.ok