diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
| commit | 6335f5d5186dfb97453dfa1a55aabe4c6f3962b0 (patch) | |
| tree | 1582b9b5d7e2005aaa2dfe5a23e2d422fe4f094e /actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb | |
| parent | 70e3dfb2e9f94396eb6525d13f9adccd3e845c3d (diff) | |
| parent | dc88847e5ce392eed210b97525c14fca55852867 (diff) | |
| download | rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.gz rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.bz2 rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.zip | |
Merge branch 'master' into bodyparts
Diffstat (limited to 'actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb index eb1457a850..0ff32df181 100644 --- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb +++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb @@ -12,7 +12,11 @@ module Rack # first, since they are most specific. class URLMap - def initialize(map) + def initialize(map = {}) + remap(map) + end + + def remap(map) @mapping = map.map { |location, app| if location =~ %r{\Ahttps?://(.*?)(/.*)} host, location = $1, $2 |