diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-11-30 13:20:51 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-11-30 13:20:51 +0900 |
| commit | dac3b1f40591cb697cf650bff7e4cb99cc964f89 (patch) | |
| tree | da1b6a899e16fa36941ec7a6b3e73ff9d7a7b0fb /packages/backend/src | |
| parent | Update about-misskey.vue (diff) | |
| parent | Bump version to 2024.11.1-alpha.0 (diff) | |
| download | misskey-dac3b1f40591cb697cf650bff7e4cb99cc964f89.tar.gz misskey-dac3b1f40591cb697cf650bff7e4cb99cc964f89.tar.bz2 misskey-dac3b1f40591cb697cf650bff7e4cb99cc964f89.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/core/S3Service.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/api/openapi/gen-spec.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts index bb2a463354..37721d2bf1 100644 --- a/packages/backend/src/core/S3Service.ts +++ b/packages/backend/src/core/S3Service.ts @@ -28,7 +28,7 @@ export class S3Service { ? `${meta.objectStorageUseSSL ? 'https' : 'http'}://${meta.objectStorageEndpoint}` : `${meta.objectStorageUseSSL ? 'https' : 'http'}://example.net`; // dummy url to select http(s) agent - const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy); + const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy, true); const handlerOption: NodeHttpHandlerOptions = {}; if (meta.objectStorageUseSSL) { handlerOption.httpsAgent = agent as https.Agent; diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index efa47a6986..3b20ec1321 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -183,7 +183,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) { }, ...(endpoint.meta.limit ? { '429': { - description: 'To many requests', + description: 'Too many requests', content: { 'application/json': { schema: { |