diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-03-07 11:17:12 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-03-07 11:17:12 +0100 |
| commit | 09f3d81e0c8edebbe8f5698811ecfb165f942378 (patch) | |
| tree | f87198a2eaa9761201d28ea2bd3eae9c057f2785 /server/controllers/object-storage-proxy.ts | |
| parent | d9dbf27a7dacb42e49e21d5691141c2edf885644 (diff) | |
| parent | 73fb3dc53571a6e94750a9d6cb5c2e949e1adcb9 (diff) | |
| download | PeerTube-09f3d81e0c8edebbe8f5698811ecfb165f942378.tar.gz PeerTube-09f3d81e0c8edebbe8f5698811ecfb165f942378.tar.zst PeerTube-09f3d81e0c8edebbe8f5698811ecfb165f942378.zip | |
Merge branch 'release/5.1.0' into develop
Diffstat (limited to 'server/controllers/object-storage-proxy.ts')
| -rw-r--r-- | server/controllers/object-storage-proxy.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/object-storage-proxy.ts b/server/controllers/object-storage-proxy.ts index 32b8d21da..6bff05f14 100644 --- a/server/controllers/object-storage-proxy.ts +++ b/server/controllers/object-storage-proxy.ts | |||
| @@ -77,7 +77,7 @@ async function proxifyHLS (req: express.Request, res: express.Response) { | |||
| 77 | setS3Headers(res, s3Response) | 77 | setS3Headers(res, s3Response) |
| 78 | 78 | ||
| 79 | const streamReplacer = filename.endsWith('.m3u8') && doReinjectVideoFileToken(req) | 79 | const streamReplacer = filename.endsWith('.m3u8') && doReinjectVideoFileToken(req) |
| 80 | ? new StreamReplacer(line => injectQueryToPlaylistUrls(line, buildReinjectVideoFileTokenQuery(req))) | 80 | ? new StreamReplacer(line => injectQueryToPlaylistUrls(line, buildReinjectVideoFileTokenQuery(req, filename.endsWith('master.m3u8')))) |
| 81 | : new PassThrough() | 81 | : new PassThrough() |
| 82 | 82 | ||
| 83 | return pipeline( | 83 | return pipeline( |