aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/request_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-01-23 05:32:59 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-01-23 05:32:59 +0000
commit010e999092c04bd5ef9185db284a8733bc1b6ee6 (patch)
tree2f473bca51c4221ae51ba445dcb606acd49fedf3 /actionpack/test/controller/request_test.rb
parentc3cfc2636b8d14b366f15d561bc76541faa4d4b1 (diff)
downloadrails-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/test/controller/request_test.rb')
-rw-r--r--actionpack/test/controller/request_test.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index f941857c48..a7623f3403 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -237,5 +237,17 @@ class RequestTest < Test::Unit::TestCase
assert @request.xml_http_request?
assert @request.xhr?
end
+
+ def test_reports_ssl
+ assert !@request.ssl?
+ @request.env['HTTPS'] = 'on'
+ assert @request.ssl?
+ end
+
+ def test_reports_ssl_when_proxied_via_lighttpd
+ assert !@request.ssl?
+ @request.env['HTTP_X_FORWARDED_PROTO'] = 'https'
+ assert @request.ssl?
+ end
end