diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-01-23 05:32:59 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-01-23 05:32:59 +0000 |
| commit | 010e999092c04bd5ef9185db284a8733bc1b6ee6 (patch) | |
| tree | 2f473bca51c4221ae51ba445dcb606acd49fedf3 /actionpack/lib | |
| parent | c3cfc2636b8d14b366f15d561bc76541faa4d4b1 (diff) | |
| download | rails-010e999092c04bd5ef9185db284a8733bc1b6ee6.tar.gz rails-010e999092c04bd5ef9185db284a8733bc1b6ee6.tar.bz2 rails-010e999092c04bd5ef9185db284a8733bc1b6ee6.zip | |
Fixed that SSL would not correctly be detected when running lighttpd/fcgi behind lighttpd w/mod_proxy (closes #3548) [stephen_purcell@yahoo.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3467 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 7203f4b789..8b5c480626 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -153,7 +153,7 @@ module ActionController # Is this an SSL request? def ssl? - env['HTTPS'] == 'on' + env['HTTPS'] == 'on' || env['HTTP_X_FORWARDED_PROTO'] == 'https' end # Returns the interpreted path to requested resource after all the installation directory of this application was taken into account |