]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: send Content-Length in response for GET on Swift container. 4578/head
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Fri, 27 Feb 2015 14:23:16 +0000 (15:23 +0100)
committerLoic Dachary <ldachary@redhat.com>
Wed, 6 May 2015 12:03:26 +0000 (14:03 +0200)
Fixes: #10971
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 5a64fb5430b6b42174bf53a5910d9435043c1380)

src/rgw/rgw_rest_swift.cc

index c0aef74fe56d97ddbdce9e63fb0ca47d856132a8..891f134bef39b56db0ab078daad06c7b0cbab45f 100644 (file)
@@ -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;
   }