From 8e6efdbcb0f820b2ab3728662efbfb4bc45495af Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Fri, 27 Feb 2015 15:23:16 +0100 Subject: [PATCH] rgw: send Content-Length in response for GET on Swift container. Fixes: #10971 Backport: hammer Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 5a64fb5430b6b42174bf53a5910d9435043c1380) --- src/rgw/rgw_rest_swift.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index c0aef74fe56d..891f134bef39 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -207,14 +207,19 @@ next: s->formatter->close_section(); - if (!ret && s->formatter->get_len() == 0) - ret = STATUS_NO_CONTENT; - else if (ret > 0) + int64_t content_len = 0; + if (!ret) { + content_len = s->formatter->get_len(); + if (content_len == 0) { + ret = STATUS_NO_CONTENT; + } + } else if (ret > 0) { ret = 0; + } set_req_state_err(s, ret); dump_errno(s); - end_header(s, this); + end_header(s, this, NULL, content_len); if (ret < 0) { return; } -- 2.47.3