From de395b2806024af3846c93b3f10c9dc9416cd83d Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 10 Mar 2017 15:21:21 -0800
Subject: Fix and clarify redirect HTTP logic

redirect-http seemed to suggest the Pages daemon would redirect from HTTPS to
HTTP, but it seems that the opposite was implied.

Fixes issue manifested by https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1348
---
 app.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app.go')

diff --git a/app.go b/app.go
index 4ef5e730..351441d0 100644
--- a/app.go
+++ b/app.go
@@ -52,7 +52,7 @@ func (a *theApp) serveContent(ww http.ResponseWriter, r *http.Request, https boo
 	defer metrics.SessionsActive.Dec()
 
 	// Add auto redirect
-	if https && !a.RedirectHTTP {
+	if !https && a.RedirectHTTP {
 		u := *r.URL
 		u.Scheme = "https"
 		u.Host = r.Host
-- 
cgit v1.2.3