Merge 2790904 into 466d509

labstack · Jun 2, 2017 · 5d7c10a · 5d7c10a
2 parents 466d509 + 2790904
commit 5d7c10a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/context.go b/context.go
@@ -225,6 +225,12 @@ func (c *context) Scheme() string {
 	if c.IsTLS() {
 		return "https"
 	}
+	if scheme := c.request.Header.Get(HeaderXForwardedProto); scheme != "" {
+		return scheme
+	}	
+	if ssl := c.request.Header.Get(HeaderXForwardedSsl); ssl == "on" {
+		return "https"
+	}
 	return "http"
 }
 

diff --git a/echo.go b/echo.go
@@ -183,6 +183,7 @@ const (
 	HeaderXForwardedProto               = "X-Forwarded-Proto"
 	HeaderXHTTPMethodOverride           = "X-HTTP-Method-Override"
 	HeaderXForwardedFor                 = "X-Forwarded-For"
+	HeaderXForwardedSsl                 = "X-Forwarded-Ssl"
 	HeaderXRealIP                       = "X-Real-IP"
 	HeaderXRequestID                    = "X-Request-ID"
 	HeaderServer                        = "Server"