From 4a9d4c85c3ad188d188104a7154d916aab079146 Mon Sep 17 00:00:00 2001
From: Larry Lv <larrylv1990@gmail.com>
Date: Thu, 12 Jun 2014 14:15:29 +0800
Subject: Fix request's path_info when a rack app mounted at '/'.

Fixes issue #15511.
---
 actionpack/CHANGELOG.md                          | 6 ++++++
 actionpack/lib/action_dispatch/journey/router.rb | 1 +
 actionpack/test/dispatch/mount_test.rb           | 7 +++++++
 3 files changed, 14 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index a9a00dcb6d..c38b31903b 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Fix env['PATH_INFO'] missing leading slash when a rack app mounted at '/'.
+
+    Fixes #15511.
+
+    *Larry Lv*
+
 *   ActionController::Parameters#require now accepts `false` values.
 
     Fixes #15685.
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
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index cdf00d84fb..bd3f6274de 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -31,6 +31,8 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     resources :users do
       mount FakeEngine, :at => "/fakeengine", :as => :fake_mounted_at_resource
     end
+
+    mount SprocketsApp, :at => "/", :via => :get
   end
 
   def app
@@ -44,6 +46,11 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
           "A named route should be defined with a parent's prefix"
   end
 
+  def test_mounting_at_root_path
+    get "/omg"
+    assert_equal " -- /omg", response.body
+  end
+
   def test_mounting_sets_script_name
     get "/sprockets/omg"
     assert_equal "/sprockets -- /omg", response.body
-- 
cgit v1.2.3