Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
WithoutPants
2019-10-17 10:16:36 +11:00
parent eb0cd674c1 c8e0ac7d20
commit 019712bff9
216 changed files with 831 additions and 35960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/server.go
View File

@@ -235,7 +235,7 @@ func BaseURLMiddleware(next http.Handler) http.Handler {
ctx := r.Context()
var scheme string
if strings.Compare("https", r.URL.Scheme) == 0 || r.Proto == "HTTP/2.0" {
if strings.Compare("https", r.URL.Scheme) == 0 || r.Proto == "HTTP/2.0" || r.Header.Get("X-Forwarded-Proto") == "https" {
scheme = "https"
} else {
scheme = "http"