From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 20 Apr 2015 16:21:24 +0000 (-0700)
Subject: Merge pull request #3863 from rzarzynski/wip-10971
X-Git-Tag: v9.0.1~113
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb787a403b34699a318f796fe26ed97e326f8f68;p=ceph.git

Merge pull request #3863 from rzarzynski/wip-10971

rgw: multiple fixes for Content-Length header generation in Swift API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

eb787a403b34699a318f796fe26ed97e326f8f68
diff --cc src/rgw/rgw_rest.cc
index 6fbe937331aa,601a265ac144..d3bfca2c946e
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@@ -529,14 -525,14 +529,18 @@@ void end_header(struct req_state *s, RG
        s->formatter->dump_string("Message", s->err.message);
      s->formatter->close_section();
      dump_content_length(s, s->formatter->get_len());
+   } else {
+     if (proposed_content_length != NO_CONTENT_LENGTH) {
+       dump_content_length(s, proposed_content_length);
+     }
    }
 -  int r = s->cio->print("Content-type: %s\r\n", content_type);
 -  if (r < 0) {
 -    ldout(s->cct, 0) << "ERROR: s->cio->print() returned err=" << r << dendl;
 +
 +  int r;
 +  if (content_type) {
 +      r = s->cio->print("Content-type: %s\r\n", content_type);
 +      if (r < 0) {
 +	ldout(s->cct, 0) << "ERROR: s->cio->print() returned err=" << r << dendl;
 +      }
    }
    r = s->cio->complete_header();
    if (r < 0) {