diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-03-06 12:12:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-06 12:12:54 +0000 |
| commit | 5ebbb62193f434cad09c2dfc171f2f4774097726 (patch) | |
| tree | d4337abb844028774f5b4a84fcfb78760cf57a93 /actionpack/lib | |
| parent | 003bd6ebe2ba8644a0b331a9b5de8bfc1847b854 (diff) | |
| parent | 32046deced9ab891c59a5474419b69824b3c8803 (diff) | |
| download | rails-5ebbb62193f434cad09c2dfc171f2f4774097726.tar.gz rails-5ebbb62193f434cad09c2dfc171f2f4774097726.tar.bz2 rails-5ebbb62193f434cad09c2dfc171f2f4774097726.zip | |
Merge pull request #28250 from tzabaman/fix_malformed_asset_url_in_ac_renderer
Fix malformed asset_url in 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 |