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

Fix direct stream not working in Safari (#2581)

Browse Source
This commit is contained in:
WithoutPants
2022-05-12 12:10:46 +10:00
committed by GitHub
parent ea2fcd9d7f
commit 31cb8e2cbd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/manager/running_streams.go
View File

@@ -58,8 +58,11 @@ func (s *SceneServer) StreamSceneDirect(scene *models.Scene, w http.ResponseWrit
filepath := GetInstance().Paths.Scene.GetStreamPath(scene.Path, scene.GetHash(fileNamingAlgo))
streamRequestCtx := NewStreamRequestContext(w, r)
lockCtx := GetInstance().ReadLockManager.ReadLock(streamRequestCtx, filepath)
defer lockCtx.Cancel()
// #2579 - hijacking and closing the connection here causes video playback to fail in Safari
// We trust that the request context will be closed, so we don't need to call Cancel on the
// returned context here.
_ = GetInstance().ReadLockManager.ReadLock(streamRequestCtx, filepath)
http.ServeFile(w, r, filepath)
}