pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/hotfix/v8.3.3' into release/v9.0.0

Browse Source
This commit is contained in:
Sergey Konovalov
2025-04-21 13:03:53 +03:00
parent a608347176 3efdebc488
commit ea58dee753
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Common/sources/storage/storage-s3.js
View File

@ -33,7 +33,8 @@
'use strict';
const fs = require('fs');
const url = require('url');
const { Agent } = require('https');
const { Agent: HttpsAgent } = require('https');
const { Agent: HttpAgent } = require('http');
const path = require('path');
const { S3Client, ListObjectsCommand, HeadObjectCommand} = require("@aws-sdk/client-s3");
const { GetObjectCommand, PutObjectCommand, CopyObjectCommand} = require("@aws-sdk/client-s3");
@ -76,11 +77,12 @@ function getS3Client(storageCfg) {
configS3.tls = storageCfg.sslEnabled;
configS3.forcePathStyle = storageCfg.s3ForcePathStyle;
}
//todo dedicated options?
const agent = new Agent(cfgRequestDefaults);
//Use separate agents for HTTP and HTTPS
const httpsAgent = new HttpsAgent(cfgRequestDefaults);
const httpAgent = new HttpAgent(cfgRequestDefaults);
configS3.requestHandler = new NodeHttpHandler({
httpAgent: agent,
httpsAgent: agent
httpAgent: httpAgent,
httpsAgent: httpsAgent
});
let configJson = JSON.stringify(configS3);
let client = clients[configJson];