diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-12 11:47:59 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-12 11:47:59 -0800 |
| commit | ef1dfb62d7becb14c3905f1b86f811f2fd8721d6 (patch) | |
| tree | 66757ac9ca78008ac6dfbb50697f71c51169d6d8 /actionpack/lib/action_controller | |
| parent | 488c9ef64c6717b48963a4c26ccf4fc888149da3 (diff) | |
| parent | 321dae5dccded1eff6587582c8f0e0b88ca8303c (diff) | |
| download | rails-ef1dfb62d7becb14c3905f1b86f811f2fd8721d6.tar.gz rails-ef1dfb62d7becb14c3905f1b86f811f2fd8721d6.tar.bz2 rails-ef1dfb62d7becb14c3905f1b86f811f2fd8721d6.zip | |
Merge pull request #4429 from marcinbunsch/1923-force-ssl-redirect-keep-flash
When force redirecting to SSL, make sure that the session is kept
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 0fd42f9d8a..b45f211e83 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 + flash.keep redirect_to redirect_options end end |