diff options
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index 65670b0ff1..e3b15b43b9 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -51,20 +51,16 @@ module ActionDispatch end def call(env) - path = env['PATH_INFO'].chomp('/') - response = @app.call(env) - - if response[1]['X-Cascade'] == 'pass' - case env['REQUEST_METHOD'] - when 'GET', 'HEAD' - if match = @file_handler.match?(path) - env["PATH_INFO"] = match - return @file_handler.call(env) - end + case env['REQUEST_METHOD'] + when 'GET', 'HEAD' + path = env['PATH_INFO'].chomp('/') + if match = @file_handler.match?(path) + env["PATH_INFO"] = match + return @file_handler.call(env) end end - response + @app.call(env) end end end |