From: Ilsoo Byun <ilsoobyun@linecorp.com>
Date: Mon, 2 Nov 2020 07:10:44 +0000 (+0900)
Subject: rgw: fix invalid payload issue when serving s3website error page
X-Git-Tag: v14.2.17~88^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38590%2Fhead;p=ceph.git

rgw: fix invalid payload issue when serving s3website error page

Fixes: https://tracker.ceph.com/issues/48064

Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit f3df3d3763c1d50cd734f4d73055454d1b64f978)

Conflicts:
	src/rgw/rgw_rest_s3.cc
- RGWHandler_REST_S3Website::serve_errordoc() takes different arguments in
  nautilus
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 703fff8d98111..f25890f527ab8 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -4310,7 +4310,7 @@ int RGWHandler_REST_S3Website::error_handler(int err_no,
        On failure, we need the double-error handler
      */
     new_err_no = RGWHandler_REST_S3Website::serve_errordoc(http_error_code, s->bucket_info.website_conf.error_doc);
-    if (new_err_no && new_err_no != -1) {
+    if (new_err_no != -1) {
       err_no = new_err_no;
     }
   } else {