From 07dcbd97b9110d25e9cde3c93976254e73d919dc Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 16 Feb 2005 12:08:00 +0000 Subject: Fixed https handling on other ports than 443 [Alan Gano] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@637 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 2e7957caf9..aaefe92ebf 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -78,7 +78,7 @@ module ActionController end def protocol - port == 443 ? 'https://' : 'http://' + env["HTTPS"] == "on" ? 'https://' : 'http://' end def ssl? -- cgit v1.2.3