mirror of
https://github.com/stashapp/stash.git
synced 2025-12-16 20:07:05 +03:00
* Partial fix for #2761 - Add reverse proxy prefix to HLS links --------- Co-authored-by: Guido <guido@test.com> Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
@@ -426,9 +426,11 @@ func serveHLSManifest(sm *StreamManager, w http.ResponseWriter, r *http.Request,
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
prefix := r.Header.Get("X-Forwarded-Prefix")
|
||||||
|
|
||||||
baseUrl := *r.URL
|
baseUrl := *r.URL
|
||||||
baseUrl.RawQuery = ""
|
baseUrl.RawQuery = ""
|
||||||
baseURL := baseUrl.String()
|
baseURL := prefix + baseUrl.String()
|
||||||
|
|
||||||
urlQuery := url.Values{}
|
urlQuery := url.Values{}
|
||||||
apikey := r.URL.Query().Get(apiKeyParamKey)
|
apikey := r.URL.Query().Get(apiKeyParamKey)
|
||||||
@@ -559,9 +561,11 @@ func serveDASHManifest(sm *StreamManager, w http.ResponseWriter, r *http.Request
|
|||||||
mediaDuration := mpd.Duration(time.Duration(probeResult.FileDuration * float64(time.Second)))
|
mediaDuration := mpd.Duration(time.Duration(probeResult.FileDuration * float64(time.Second)))
|
||||||
m := mpd.NewMPD(mpd.DASH_PROFILE_LIVE, mediaDuration.String(), "PT4.0S")
|
m := mpd.NewMPD(mpd.DASH_PROFILE_LIVE, mediaDuration.String(), "PT4.0S")
|
||||||
|
|
||||||
|
prefix := r.Header.Get("X-Forwarded-Prefix")
|
||||||
|
|
||||||
baseUrl := r.URL.JoinPath("/")
|
baseUrl := r.URL.JoinPath("/")
|
||||||
baseUrl.RawQuery = ""
|
baseUrl.RawQuery = ""
|
||||||
m.BaseURL = baseUrl.String()
|
m.BaseURL = prefix + baseUrl.String()
|
||||||
|
|
||||||
video, _ := m.AddNewAdaptationSetVideo(MimeWebmVideo, "progressive", true, 1)
|
video, _ := m.AddNewAdaptationSetVideo(MimeWebmVideo, "progressive", true, 1)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user