From b0714c3d2d5562a59666a376e1dac04aae3e0672 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Fri, 4 Sep 2015 15:11:35 +0200 Subject: [PATCH] rgw: don't append empty ETag HTTP header. Fixes: #12950 Signed-off-by: Radoslaw Zarzynski --- src/rgw/rgw_rest.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index c69d7ecefc20e..cb84b27c4812d 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -339,13 +339,19 @@ void dump_content_length(struct req_state *s, uint64_t len) } } -void dump_etag(struct req_state *s, const char *etag) +void dump_etag(struct req_state * const s, const char * const etag) { + if ('\0' == *etag) { + return; + } + int r; - if (s->prot_flags & RGW_REST_SWIFT) + if (s->prot_flags & RGW_REST_SWIFT) { r = s->cio->print("etag: %s\r\n", etag); - else + } else { r = s->cio->print("ETag: \"%s\"\r\n", etag); + } + if (r < 0) { ldout(s->cct, 0) << "ERROR: s->cio->print() returned err=" << r << dendl; } -- 2.39.5