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

Merge from master

Browse Source
This commit is contained in:
WithoutPants
2019-10-17 09:31:04 +11:00
parent 41c8cac738 c8e0ac7d20
commit 1b98702e17
216 changed files with 831 additions and 35747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/server.go
View File

@@ -224,7 +224,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"