From e2b4cfe1e0bf36f6e2161a4b0cc0278c57773dbe Mon Sep 17 00:00:00 2001 From: Ilsoo Byun Date: Mon, 2 Nov 2020 16:10:44 +0900 Subject: [PATCH] rgw: fix invalid payload issue when serving s3website error page Fixes: https://tracker.ceph.com/issues/48064 Signed-off-by: Ilsoo Byun (cherry picked from commit f3df3d3763c1d50cd734f4d73055454d1b64f978) Conflicts: src/rgw/rgw_rest_s3.cc - octopus does not have 01ce52e52e98dcb6f8b367cb8b352646b741b81c but this does not seem to be relevant to the backport --- src/rgw/rgw_rest_s3.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index d3ac614fc7f..8b67ef4b612 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -5137,7 +5137,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 { -- 2.47.3