RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30584 from zhangsw/fix-rgw-expiration-header

Browse Source 
rgw: filter prefix should be used when generating expiration header

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
J. Eric Ivancich 2020-09-03 13:16:21 -04:00 committed by GitHub
commit 29836e692c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rgw/rgw_lc.cc
View File

@ -2154,8 +2154,8 @@ std::string s3_expiration_header(
for (const auto& ri : rule_map) {
const auto& rule = ri.second;
auto& id = rule.get_id();
auto& prefix = rule.get_prefix();
auto& filter = rule.get_filter();
auto& prefix = filter.has_prefix() ? filter.get_prefix(): rule.get_prefix();
auto& expiration = rule.get_expiration();
auto& noncur_expiration = rule.get_noncur_expiration();
@ -2185,7 +2185,7 @@ std::string s3_expiration_header(
if(! prefix.empty()) {
if (! boost::starts_with(obj_key.name, prefix))
continue;
continue;
}
if (filter.has_tags()) {