aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-16 12:08:00 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-16 12:08:00 +0000
commit07dcbd97b9110d25e9cde3c93976254e73d919dc (patch)
treece4c6cbdb066a3429184e5b8eaf87fde6c7a9550 /actionpack
parentd4aead0d508d30b57cf2a338d6c8cd2f2b954699 (diff)
downloadrails-07dcbd97b9110d25e9cde3c93976254e73d919dc.tar.gz
rails-07dcbd97b9110d25e9cde3c93976254e73d919dc.tar.bz2
rails-07dcbd97b9110d25e9cde3c93976254e73d919dc.zip
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
Diffstat (limited to 'actionpack')
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
1 files changed, 1 insertions, 1 deletions
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?