diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2019-07-31 11:39:58 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2019-07-31 11:51:59 +0900 |
| commit | a1d7d4c6dc5c4a7b8ef28f6408c3d91ca1cbae09 (patch) | |
| tree | 7b9aed6e09b05e376b06abdefbd8fb2e85442ede /actionpack | |
| parent | 05060ddba170ccb3ba9ce48555ed45400fe1ea96 (diff) | |
| download | rails-a1d7d4c6dc5c4a7b8ef28f6408c3d91ca1cbae09.tar.gz rails-a1d7d4c6dc5c4a7b8ef28f6408c3d91ca1cbae09.tar.bz2 rails-a1d7d4c6dc5c4a7b8ef28f6408c3d91ca1cbae09.zip | |
Reduce Hash object creation when normalizing request env
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/renderer.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb index af344b98d2..b48c7a1afa 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -65,7 +65,7 @@ module ActionController def initialize(controller, env, defaults) @controller = controller @defaults = defaults - @env = normalize_keys defaults.merge(env) + @env = normalize_keys defaults, env end # Render templates with any options from ActionController::Base#render_to_string. @@ -97,8 +97,9 @@ module ActionController end private - def normalize_keys(env) + def normalize_keys(defaults, env) new_env = {} + defaults.each_pair { |k, v| new_env[rack_key_for(k)] = rack_value_for(k, v) } env.each_pair { |k, v| new_env[rack_key_for(k)] = rack_value_for(k, v) } new_env["rack.url_scheme"] = new_env["HTTPS"] == "on" ? "https" : "http" new_env |