From 7a1e4e67e7b74ac61a3e40f6e7c1203ca3cac7dd Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 13 Mar 2023 17:21:47 -0400 Subject: [PATCH] rgw: add default Server response header if a specific rgw_service_provider_name is not configured, add a default Server response header that includes the ceph release name: Server: Ceph Object Gateway (reef) Signed-off-by: Casey Bodley --- src/rgw/rgw_rest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index d37afff526a4..777a0bf5569e 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -7,6 +7,7 @@ #include #include +#include "ceph_ver.h" #include "common/Formatter.h" #include "common/HTMLFormatter.h" #include "common/utf8.h" @@ -615,7 +616,13 @@ void end_header(req_state* s, RGWOp* op, const char *content_type, if (content_type) { dump_header(s, "Content-Type", content_type); } - dump_header_if_nonempty(s, "Server", g_conf()->rgw_service_provider_name); + + std::string srv = g_conf().get_val("rgw_service_provider_name"); + if (!srv.empty()) { + dump_header(s, "Server", srv); + } else { + dump_header(s, "Server", "Ceph Object Gateway (" CEPH_RELEASE_NAME ")"); + } try { RESTFUL_IO(s)->complete_header(); -- 2.47.3