Merge pull request #15082 from joke-lee/fix-website-redirect-request-to-master

rgw-multisite: fix the problem of rgw website configure request not redirect to metadata master

Reviewed-by: Casey Bodley <cbodley@redhat.com>

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
index 1cca4cc83713ed387a82d8f253b6bf9204aa8fe0,684e65a66cee4aa0a8f9ff6054e5ee1d2c0133ab..f6bbe9da59b62fbf67352d21798c1a97f64b64de
--- 1/src/rgw/rgw_rest_s3.cc
--- 2/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@@ -842,11 -843,16 +842,14 @@@ int RGWSetBucketWebsite_ObjStore_S3::ge
  
    auto data_deleter = std::unique_ptr<char, decltype(free)*>{data, free};
  
 -  if (s->aws4_auth_needs_complete) {
 -      int ret_auth = do_aws4_auth_completion();
 -      if (ret_auth < 0) {
 -        return ret_auth;
 -      }
 +  r = do_aws4_auth_completion();
 +  if (r < 0) {
 +    return r;
    }
  
+   bufferptr in_ptr(data, len);
+   in_data.append(in_ptr);
+ 
    RGWXMLDecoder::XMLParser parser;
    if (!parser.init()) {
      ldout(s->cct, 0) << "ERROR: failed to initialize parser" << dendl;