diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 10:34:38 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 10:34:38 -0800 |
| commit | 12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e (patch) | |
| tree | 9866451e41e9562a51bdc91f732794d7db979d6c /actionpack/lib/action_controller | |
| parent | 275c3a1cb3d0f38d1a28b1a8d6145a4d7e379acc (diff) | |
| parent | 30e5503d004971a8c7ddb039f9023dca3a6bdcd7 (diff) | |
| download | rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.tar.gz rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.tar.bz2 rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.zip | |
Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_params_master
Fix force_ssl redirect with params
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index b45f211e83..69e37d8713 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -29,6 +29,7 @@ module ActionController if !request.ssl? && !Rails.env.development? redirect_options = {:protocol => 'https://', :status => :moved_permanently} redirect_options.merge!(:host => host) if host + redirect_options.merge!(:params => request.query_parameters) flash.keep redirect_to redirect_options end |