diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2024-12-08 08:07:55 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2024-12-08 08:07:55 -0500 |
| commit | 3864d1dacf269b82d731ef99a3bd663c44f5e086 (patch) | |
| tree | b8aa71e0ea74c1de6131143b10d882631bd15f03 /packages/backend/src/server | |
| parent | Merge branch 'develop' into feature/2024.10 (diff) | |
| parent | merge: Fix Content-Length resetting for partial content length requests (!796) (diff) | |
| download | sharkey-3864d1dacf269b82d731ef99a3bd663c44f5e086.tar.gz sharkey-3864d1dacf269b82d731ef99a3bd663c44f5e086.tar.bz2 sharkey-3864d1dacf269b82d731ef99a3bd663c44f5e086.zip | |
Merge branch 'develop' into feature/2024.10
# Conflicts:
# packages/frontend/src/pages/admin/index.vue
Diffstat (limited to 'packages/backend/src/server')
| -rw-r--r-- | packages/backend/src/server/FileServerService.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts index a4d0588fbe..18d313db06 100644 --- a/packages/backend/src/server/FileServerService.ts +++ b/packages/backend/src/server/FileServerService.ts @@ -192,6 +192,9 @@ export class FileServerService { } } + // set Content-Length before we chunk, so it can properly override when chunking. + reply.header('Content-Length', file.file.size); + if (!image) { if (request.headers.range && file.file.size > 0) { const range = request.headers.range as string; @@ -235,7 +238,6 @@ export class FileServerService { } reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(image.type) ? image.type : 'application/octet-stream'); - reply.header('Content-Length', file.file.size); reply.header('Cache-Control', 'max-age=31536000, immutable'); reply.header('Content-Disposition', contentDisposition( |