kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Reduce Hash object creation when normalizing request env

Browse source
This commit is contained in:
Akira Matsuda 2019-07-31 11:39:58 +09:00
parent 05060ddba1
commit a1d7d4c6dc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionpack/lib/action_controller/renderer.rb
View file

@ -65,7 +65,7 @@ module ActionController
def initialize(controller, env, defaults) def initialize(controller, env, defaults)
@controller = controller @controller = controller
@defaults = defaults @defaults = defaults
@env = normalize_keys defaults.merge(env) @env = normalize_keys defaults, env
end end
# Render templates with any options from ActionController::Base#render_to_string. # Render templates with any options from ActionController::Base#render_to_string.
@ -97,8 +97,9 @@ module ActionController
end end
private private
def normalize_keys(env) def normalize_keys(defaults, env)
new_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) } 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["rack.url_scheme"] = new_env["HTTPS"] == "on" ? "https" : "http"
new_env new_env