]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #27356 from pdvian/wip-38922-mimic
authorYuri Weinstein <yweinste@redhat.com>
Mon, 6 May 2019 16:28:21 +0000 (09:28 -0700)
committerGitHub <noreply@github.com>
Mon, 6 May 2019 16:28:21 +0000 (09:28 -0700)
mimic: rgw: Fix S3 compatibility bug when CORS is not found

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_rest_s3.cc

index 65f1effbfddbcbd1a1583a078e8f41458d9829a5,3471c850abcb9c1580121dda5ee150a65728db14..415d0f10637d15061cf0e8df9d2f39bbe0ff2b51
@@@ -93,8 -92,8 +93,9 @@@ rgw_http_errors rgw_http_s3_errors(
      { ERR_NO_SUCH_BUCKET_POLICY, {404, "NoSuchBucketPolicy"}},
      { ERR_NO_SUCH_USER, {404, "NoSuchUser"}},
      { ERR_NO_ROLE_FOUND, {404, "NoSuchEntity"}},
 +    { ERR_NO_CORS_FOUND, {404, "NoSuchCORSConfiguration"}},
      { ERR_NO_SUCH_SUBUSER, {404, "NoSuchSubUser"}},
+     { ERR_NO_SUCH_CORS_CONFIGURATION, {404, "NoSuchCORSConfiguration"}},
      { ERR_METHOD_NOT_ALLOWED, {405, "MethodNotAllowed" }},
      { ETIMEDOUT, {408, "RequestTimeout" }},
      { EEXIST, {409, "BucketAlreadyExists" }},
Simple merge
Simple merge