Skip to content

Commit 2adbb08

Browse files
authored
Merge pull request #9180 from liranmauda/liran-backport-into-5.14
[Backport into 5.14] Backport some fixes
2 parents 900f421 + 797551b commit 2adbb08

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ config.BUCKET_RECLAIMER_ERROR_DELAY = 3000;
321321
config.OBJECT_RECLAIMER_ENABLED = true;
322322
config.OBJECT_RECLAIMER_EMPTY_DELAY = 60 * 60 * 1000; // 1 hour delay
323323
config.OBJECT_RECLAIMER_BATCH_SIZE = 100;
324-
config.OBJECT_RECLAIMER_BATCH_DELAY = 10 * 60 * 1000; // 10 minutes delay between batches
325-
config.OBJECT_RECLAIMER_ERROR_DELAY = 10 * 60 * 1000; // 10 minutes delay between batches;
324+
config.OBJECT_RECLAIMER_BATCH_DELAY = 100;
325+
config.OBJECT_RECLAIMER_ERROR_DELAY = 3000;
326326

327327
//////////////////
328328
// CHUNK CONFIG //

src/util/http_utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ function check_headers(req, options) {
559559

560560
const content_encoding = req.headers['content-encoding'] || '';
561561
req.chunked_content =
562-
content_encoding.split(',').includes('aws-chunked') ||
562+
content_encoding.split(',').map(encoding => encoding.trim()).includes('aws-chunked') ||
563563
content_sha256_hdr === STREAMING_PAYLOAD;
564564

565565
const req_time =

0 commit comments

Comments
 (0)