diff options
author | Enming Zhang <enming.zhang@umcloud.com> | 2019-07-05 17:09:22 +0200 |
---|---|---|
committer | Enming Zhang <enming.zhang@umcloud.com> | 2019-07-05 17:22:44 +0200 |
commit | 355f392ad26631f44dac250296e96f421d86fb8f (patch) | |
tree | 5e8af2683de8d3c1378306f3643211e1ca90b99b /src/rgw/rgw_xml_enc.cc | |
parent | Merge pull request #28858 from callithea/wip-issue-40395 (diff) | |
download | ceph-355f392ad26631f44dac250296e96f421d86fb8f.tar.xz ceph-355f392ad26631f44dac250296e96f421d86fb8f.zip |
rgw: fix the bug of rgw not doing necessary checking to website configuration
Fixes: http://tracker.ceph.com/issues/40678
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
Diffstat (limited to 'src/rgw/rgw_xml_enc.cc')
-rw-r--r-- | src/rgw/rgw_xml_enc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rgw/rgw_xml_enc.cc b/src/rgw/rgw_xml_enc.cc index 44a9364b802..1b9d250a7a6 100644 --- a/src/rgw/rgw_xml_enc.cc +++ b/src/rgw/rgw_xml_enc.cc @@ -116,11 +116,13 @@ void decode_xml_obj(list<RGWBWRoutingRule>& l, XMLObj *obj) void RGWBucketWebsiteConf::decode_xml(XMLObj *obj) { XMLObj *o = obj->find_first("RedirectAllRequestsTo"); if (o) { + is_redirect_all = true; RGWXMLDecoder::decode_xml("HostName", redirect_all.hostname, o, true); RGWXMLDecoder::decode_xml("Protocol", redirect_all.protocol, o); } else { o = obj->find_first("IndexDocument"); if (o) { + is_set_index_doc = true; RGWXMLDecoder::decode_xml("Suffix", index_doc_suffix, o); } o = obj->find_first("ErrorDocument"); |