summaryrefslogtreecommitdiffstats
path: root/api/context.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-08 09:07:47 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-08 09:07:47 -0400
commit3012a7f532815bf0b77d3a595712221cc6efc047 (patch)
tree5df8a672d7c60b3204496d0f3f8b2b2ce3fba7fc /api/context.go
parent450821bcbae2769bf616405401cd3020f7686820 (diff)
parente3ab0a4e3ddb4b1bfacd2b82073c4a48e58751d6 (diff)
downloadchat-3012a7f532815bf0b77d3a595712221cc6efc047.tar.gz
chat-3012a7f532815bf0b77d3a595712221cc6efc047.tar.bz2
chat-3012a7f532815bf0b77d3a595712221cc6efc047.zip
Merge pull request #136 from mattermost/code-review
team code review
Diffstat (limited to 'api/context.go')
-rw-r--r--api/context.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/context.go b/api/context.go
index 501e4e77f..bea0fbeff 100644
--- a/api/context.go
+++ b/api/context.go
@@ -84,6 +84,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if forwardProto == "http" {
l4g.Info("redirecting http request to https for %v", r.URL.Path)
http.Redirect(w, r, "https://"+r.Host, http.StatusTemporaryRedirect)
+ return
} else {
protocol = "https"
}