rgw: Do not send a Content-Type on a '304 Not Modified' response

When we say the Content has not changed we should not respond
with a content type which defaults to binary/octet stream.

Fixes: #15119
Signed-off-by: Wido den Hollander <wido@42on.com>

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index a31b95b0b63e5671f0593b3fee864a5addde05f8..f24cbae5bdc004fccd448b4c01b8403a65f72456 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -257,10 +257,14 @@ done:
                        riter->second.c_str());
   }
 
-  if (!content_type)
-    content_type = "binary/octet-stream";
+  if (op_ret == ERR_NOT_MODIFIED) {
+      end_header(s, this);
+  } else {
+      if (!content_type)
+          content_type = "binary/octet-stream";
 
-  end_header(s, this, content_type);
+      end_header(s, this, content_type);
+  }
 
   if (metadata_bl.length()) {
     STREAM_IO(s)->write(metadata_bl.c_str(), metadata_bl.length());