aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-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?