aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-13 19:56:01 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-13 19:56:01 -0300
commitc0ba02281e50a77733c7034b5d249325e789426e (patch)
tree4fa442ed68b6a7d900d254d826578b9fbb3ebe72 /actionpack/lib
parent9f0cd30d90a8966011dbc655f81a365ad350819d (diff)
parent4a9d4c85c3ad188d188104a7154d916aab079146 (diff)
downloadrails-c0ba02281e50a77733c7034b5d249325e789426e.tar.gz
rails-c0ba02281e50a77733c7034b5d249325e789426e.tar.bz2
rails-c0ba02281e50a77733c7034b5d249325e789426e.zip
Merge pull request #15660 from larrylv/fix-mount-at-root-path
Fix request's path_info when a rack app mounted at '/'.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/journey/router.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index 74fa9ee3a2..fe3fc0a9fa 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -35,6 +35,7 @@ module ActionDispatch
unless route.path.anchored
req.script_name = (script_name.to_s + match.to_s).chomp('/')
req.path_info = match.post_match
+ req.path_info = "/" + req.path_info unless req.path_info.start_with? "/"
end
req.path_parameters = set_params.merge parameters