diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-03 15:35:40 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-03 15:35:40 +0900 |
| commit | 5bd68aa3e0ce65a9183e193ff113b2486021f679 (patch) | |
| tree | 7cce90cfd87cbdfc932226273a6a89aa7871b33e /packages/backend/src/server/FileServerService.ts | |
| parent | Merge pull request #10112 from misskey-dev/develop (diff) | |
| parent | fix CHANGELOG.md (diff) | |
| download | misskey-5bd68aa3e0ce65a9183e193ff113b2486021f679.tar.gz misskey-5bd68aa3e0ce65a9183e193ff113b2486021f679.tar.bz2 misskey-5bd68aa3e0ce65a9183e193ff113b2486021f679.zip | |
Merge pull request #10177 from misskey-dev/develop
Release: 13.9.0
Diffstat (limited to 'packages/backend/src/server/FileServerService.ts')
| -rw-r--r-- | packages/backend/src/server/FileServerService.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts index c12ae9b824..e5eefac1fa 100644 --- a/packages/backend/src/server/FileServerService.ts +++ b/packages/backend/src/server/FileServerService.ts @@ -226,7 +226,10 @@ export class FileServerService { return; } - if (this.config.externalMediaProxyEnabled) { + // アバタークロップなど、どうしてもオリジンである必要がある場合 + const mustOrigin = 'origin' in request.query; + + if (this.config.externalMediaProxyEnabled && !mustOrigin) { // 外部のメディアプロキシが有効なら、そちらにリダイレクト reply.header('Cache-Control', 'public, max-age=259200'); // 3 days |