Merge pull request #120 from duckdb/main

carlopi · web-flow · commit 7ee09f439c52 · 2025-09-08T20:22:48.000+02:00
Merge main (with etag fixes) in v1.4-andium
diff --git a/extension/httpfs/s3fs.cpp b/extension/httpfs/s3fs.cpp
@@ -1281,6 +1281,7 @@ void AWSListObjectV2::ParseFileList(string &aws_response, vector<OpenFileInfo> &
 		auto etag_pos = FindTagContents(contents, "ETag", 0, etag);
 		if (etag_pos.IsValid()) {
 			etag = StringUtil::Replace(etag, "&quot;", "\"");
+			etag = StringUtil::Replace(etag, "&#34;", "\"");
 			extra_info->options["etag"] = Value(std::move(etag));
 		}
 		auto size_pos = FindTagContents(contents, "Size", 0, size);

Original file line number	Diff line number	Diff line change
`@@ -1281,6 +1281,7 @@ void AWSListObjectV2::ParseFileList(string &aws_response, vector<OpenFileInfo> &`
`1281`	`1281`	`auto etag_pos = FindTagContents(contents, "ETag", 0, etag);`
`1282`	`1282`	`if (etag_pos.IsValid()) {`
`1283`	`1283`	`etag = StringUtil::Replace(etag, """, "\"");`
	`1284`	`+ etag = StringUtil::Replace(etag, """, "\"");`
`1284`	`1285`	`extra_info->options["etag"] = Value(std::move(etag));`
`1285`	`1286`	`}`
`1286`	`1287`	`auto size_pos = FindTagContents(contents, "Size", 0, size);`