diff options
| author | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
| commit | 9d109b070037951fcd0832b785eba8a3db9a157c (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /app/login.go | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | a21a06afd9907e9911dcb166d902cba9f405c7cb (diff) | |
| download | chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.gz chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.bz2 chat-9d109b070037951fcd0832b785eba8a3db9a157c.zip | |
Merge branch 'release-3.9' into merge-3.9
Diffstat (limited to 'app/login.go')
| -rw-r--r-- | app/login.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/login.go b/app/login.go index 4f9284140..2528f9367 100644 --- a/app/login.go +++ b/app/login.go @@ -138,7 +138,7 @@ func DoLogin(w http.ResponseWriter, r *http.Request, user *model.User, deviceId } func GetProtocol(r *http.Request) string { - if r.Header.Get(model.HEADER_FORWARDED_PROTO) == "https" { + if r.Header.Get(model.HEADER_FORWARDED_PROTO) == "https" || r.TLS != nil { return "https" } else { return "http" |