]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix invalid payload issue when serving s3website error page 37914/head
authorIlsoo Byun <ilsoobyun@linecorp.com>
Mon, 2 Nov 2020 07:10:44 +0000 (16:10 +0900)
committerIlsoo Byun <ilsoobyun@linecorp.com>
Mon, 16 Nov 2020 15:51:45 +0000 (00:51 +0900)
Fixes: https://tracker.ceph.com/issues/48064
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
src/rgw/rgw_rest_s3.cc

index e61327e34c1ef644957e370f8e7ce09a60c98005..3a6e52b507c88445cde3b14bae68c0085dec9388 100644 (file)
@@ -5100,7 +5100,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->get_info().website_conf.error_doc, y);
-    if (new_err_no && new_err_no != -1) {
+    if (new_err_no != -1) {
       err_no = new_err_no;
     }
   } else {