diff options
author | Giorgos Vrettos <gcv@digeratigroup.com> | 2017-03-02 11:54:58 +0200 |
---|---|---|
committer | Giorgos Vrettos <gcv@digeratigroup.com> | 2017-03-06 13:12:14 +0200 |
commit | 32046deced9ab891c59a5474419b69824b3c8803 (patch) | |
tree | d8742e05331d0d0ce8ecab310a667a898d6ea685 /actionpack/lib | |
parent | 0b5c7e354291bdf674fa8777b6443b224924bad4 (diff) | |
download | rails-32046deced9ab891c59a5474419b69824b3c8803.tar.gz rails-32046deced9ab891c59a5474419b69824b3c8803.tar.bz2 rails-32046deced9ab891c59a5474419b69824b3c8803.zip |
Fix malformed asset_url when rendering template with ActionController::Renderer
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/renderer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb index acb400cd15..e1441bd343 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -85,6 +85,7 @@ module ActionController def normalize_keys(env) new_env = {} 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 end |