From: David Lutterkort <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- server/lib/sinatra/rack_matrix_params.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/server/lib/sinatra/rack_matrix_params.rb b/server/lib/sinatra/rack_matrix_params.rb index 8a489d3..50db4a0 100644 --- a/server/lib/sinatra/rack_matrix_params.rb +++ b/server/lib/sinatra/rack_matrix_params.rb @@ -79,15 +79,9 @@ module Rack # does not trip over them # (1) Rewrite current path by stripping all matrix params from it - if env['REQUEST_PATH'] == '/' - env['REQUEST_URI'] = env['REQUEST_PATH'] - env['REQUEST_PATH'] = env['PATH_INFO'] - end - - # This is needed for OpenShift deployment / Passenger - if env['REQUEST_PATH'] - env['REQUEST_PATH'] = env['REQUEST_PATH'].remove_matrix_params - env['PATH_INFO'] = env['PATH_INFO'].remove_matrix_params + ['REQUEST_PATH', 'REQUEST_URI', 'PATH_INFO'].select { |k| + env[k] }.each do |k| + env[k] = env[k].remove_matrix_params end # (2) Append the matrix params to the 'normal' request params -- 1.7.10.2
