HTTPS clone URL
Subversion checkout URL
Please sign in to comment.
Fix handling SCRIPT_NAME from within mounted engine's
When you mount your application at a sub-uri, for example /myapp, server should set SCRIPT_NAME to /myapp. With such information, rails application knows that it's mounted at /myapp path and it should generate routes relative to such path. Before this patch, rails handled SCRIPT_NAME correctly only for regular apps, but it failed to do it for mounted engines. The solution was to hardcode default_url_options[:script_name], which is not the best answer - it will work only when application is mounted at fixed path. This patch fixes the situation by respecting original value of SCRIPT_NAME when generating application's routes from engine and the other way round - when you generate engine's route from application. This is done by using one of 2 pieces of information in env - current SCRIPT_NAME or SCRIPT_NAME for a corresponding router. This is because we have 2 cases to handle: - generating engine's route from application: in this situation SCRIPT_NAME is basically SCRIPT_NAME set by the server and it indicates the place where application is mounted, so we can just pass it as :original_script_name in url_options. :original_script_name is used because if we use :script_name, router will ignore generating prefix for engine - generating application's route from engine: in this situation we already lost information about the SCRIPT_NAME that server used. For example if application is mounted at /myapp and engine is mounted at /blog, at this point SCRIPT_NAME is equal /myapp/blog. Because of that we need to keep reference to /myapp SCRIPT_NAME by binding it to the current router. Later on we can extract it and use when generating url Please not that starting from now you *should not* use default_url_options[:script_name] explicitly if your server already passes correct SCRIPT_NAME to rack env. (closes #6933)
- Loading branch information...
Showing with 78 additions and 41 deletions.
- +8 −2 actionpack/lib/action_controller/metal/url_for.rb
- +12 −5 actionpack/lib/action_dispatch/routing/route_set.rb
- +0 −18 actionpack/test/dispatch/prefix_generation_test.rb
- +5 −0 railties/CHANGELOG.md
- +5 −1 railties/lib/rails/engine.rb
- +48 −0 railties/test/railties/engine_test.rb
- +0 −15 railties/test/railties/mounted_engine_test.rb