RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4361 from oritwas/wip-11091

Browse Source 
rgw: shouldn't return content-type: application/xml if content length is 0

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-04-14 11:53:49 -07:00
commit 4cfeca03ad
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rgw/rgw_rest.cc
View File

@ -500,7 +500,9 @@ void end_header(struct req_state *s, RGWOp *op, const char *content_type)
dump_access_control(s, op);
}
if (!content_type || s->err.is_err()) {
/* do not send content type if content length is zero
and the content type was not set by the user */
if ((s->formatter->get_len() != 0 && !content_type) || s->err.is_err()){
switch (s->format) {
case RGW_FORMAT_XML:
ctype = "application/xml";
@ -526,9 +528,13 @@ void end_header(struct req_state *s, RGWOp *op, const char *content_type)
s->formatter->close_section();
dump_content_length(s, s->formatter->get_len());
}
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) {