RGW|global CORS: fix missing headers

Signed-off-by: Ali Masarwa <amasarwa@redhat.com>

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 19d05a317f48ef4e46a9ac56d0a506f4cdd2ed76..704e3309d590c9fe1cf79c945f763ae117a71b52 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -9509,7 +9509,7 @@ void RGWDeleteBucketPolicy::send_response()
     set_req_state_err(s, op_ret);
   }
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 int RGWDeleteBucketPolicy::verify_permission(optional_yield y)
@@ -10083,7 +10083,7 @@ void RGWDeleteBucketPublicAccessBlock::send_response()
 
   set_req_state_err(s, op_ret);
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 int RGWDeleteBucketPublicAccessBlock::verify_permission(optional_yield y)

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 7dc6320c447bdd61b3d4244f605e7b040ff1af76..9008dfc98655abbbb68978908681b061f9960ca0 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -4552,7 +4552,7 @@ void RGWPutBucketOwnershipControls_ObjStore_S3::send_response()
     set_req_state_err(s, op_ret);
   }
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 void RGWGetBucketOwnershipControls_ObjStore_S3::send_response()
@@ -4582,7 +4582,7 @@ void RGWDeleteBucketOwnershipControls_ObjStore_S3::send_response()
 
   set_req_state_err(s, op_ret);
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 void RGWGetRequestPayment_ObjStore_S3::send_response()
@@ -4664,7 +4664,7 @@ void RGWSetRequestPayment_ObjStore_S3::send_response()
   if (op_ret)
     set_req_state_err(s, op_ret);
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 int RGWInitMultipart_ObjStore_S3::get_params(optional_yield y)
@@ -5265,7 +5265,7 @@ void RGWPutObjRetention_ObjStore_S3::send_response()
     set_req_state_err(s, op_ret);
   }
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 void RGWGetObjRetention_ObjStore_S3::send_response()
@@ -5290,7 +5290,7 @@ void RGWPutObjLegalHold_ObjStore_S3::send_response()
     set_req_state_err(s, op_ret);
   }
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 void RGWGetObjLegalHold_ObjStore_S3::send_response()
@@ -5335,7 +5335,7 @@ void RGWPutBucketPublicAccessBlock_ObjStore_S3::send_response()
     set_req_state_err(s, op_ret);
   }
   dump_errno(s);
-  end_header(s);
+  end_header(s, this);
 }
 
 void RGWGetBucketPublicAccessBlock_ObjStore_S3::send_response()

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index cc26b6c0212e5e01f480694f5250ae2363e7488b..e2a02adb8449a5806e9c6d0a1988c010c7469002 100644 (file)
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -867,7 +867,7 @@ void RGWCreateBucket_ObjStore_SWIFT::send_response()
 
   dump_errno(s);
   /* Propose ending HTTP header with 0 Content-Length header. */
-  end_header(s, NULL, NULL, 0);
+  end_header(s, this, NULL, 0);
   rgw_flush_formatter_and_reset(s, s->formatter);
 }
 
@@ -1612,7 +1612,7 @@ int RGWGetObj_ObjStore_SWIFT::send_response_data(bufferlist& bl,
     dump_errno(s);
 
     if (s->is_err()) {
-      end_header(s, NULL);
+      end_header(s, this);
       return 0;
     }
   }
@@ -1622,7 +1622,7 @@ int RGWGetObj_ObjStore_SWIFT::send_response_data(bufferlist& bl,
   }
 
   if (s->is_err()) {
-    end_header(s, NULL);
+    end_header(s, this);
     return 0;
   }