diff options
author | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
---|---|---|
committer | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
commit | 0f28957edd6a9c281491c854b455180efc040a1c (patch) | |
tree | 577d46d88937d4cc811e6860ce3cbdb2a1dad27a /actioncable | |
parent | ec13ef75260f6d143e947b0e5176e35e4c1229c2 (diff) | |
parent | 9ec67362054e874ed905310a79b670941fa397af (diff) | |
download | rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.gz rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.bz2 rails-0f28957edd6a9c281491c854b455180efc040a1c.zip |
Merge remote-tracking branch 'upstream/master' into nofollow-change
Diffstat (limited to 'actioncable')
-rw-r--r-- | actioncable/lib/action_cable/connection/client_socket.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/connection/client_socket.rb b/actioncable/lib/action_cable/connection/client_socket.rb index ba33c8b982..10289ab55c 100644 --- a/actioncable/lib/action_cable/connection/client_socket.rb +++ b/actioncable/lib/action_cable/connection/client_socket.rb @@ -21,7 +21,7 @@ module ActionCable return true if env["HTTP_X_FORWARDED_PROTO"] == "https" return true if env["rack.url_scheme"] == "https" - return false + false end CONNECTING = 0 |