Merge pull request #8583 from tangledbytes/utkarsh/backport/5.17/8576

nimrod-becker · web-flow · commit 289a81b4ff05 · 2024-12-05T15:53:56.000+02:00
[Backport 5.17] send x-amz-restore header as one single header instead of 2 headers with same name
diff --git a/src/endpoint/s3/s3_utils.js b/src/endpoint/s3/s3_utils.js
@@ -312,12 +312,12 @@ function set_response_object_md(res, object_md) {
         res.setHeader('x-amz-storage-class', storage_class);
     }
     if (object_md.restore_status?.ongoing || object_md.restore_status?.expiry_time) {
-        const restore = [`ongoing-request="${object_md.restore_status.ongoing}"`];
+        let restore = `ongoing-request="${object_md.restore_status.ongoing}"`;
         if (!object_md.restore_status.ongoing && object_md.restore_status.expiry_time) {
             // Expiry time is in UTC format
             const expiry_date = new Date(object_md.restore_status.expiry_time).toUTCString();
 
-            restore.push(`expiry-date="${expiry_date}"`);
+            restore += `, expiry-date="${expiry_date}"`;
         }
 
         res.setHeader('x-amz-restore', restore);

Original file line number	Diff line number	Diff line change
`@@ -312,12 +312,12 @@ function set_response_object_md(res, object_md) {`
`312`	`312`	`res.setHeader('x-amz-storage-class', storage_class);`
`313`	`313`	`}`
`314`	`314`	`if (object_md.restore_status?.ongoing \|\| object_md.restore_status?.expiry_time) {`
`315`		- const restore = [`ongoing-request="${object_md.restore_status.ongoing}"`];
	`315`	+ let restore = `ongoing-request="${object_md.restore_status.ongoing}"`;
`316`	`316`	`if (!object_md.restore_status.ongoing && object_md.restore_status.expiry_time) {`
`317`	`317`	`// Expiry time is in UTC format`
`318`	`318`	`const expiry_date = new Date(object_md.restore_status.expiry_time).toUTCString();`
`319`	`319`
`320`		- restore.push(`expiry-date="${expiry_date}"`);
	`320`	+ restore += `, expiry-date="${expiry_date}"`;
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`res.setHeader('x-amz-restore', restore);`