RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 22:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

For zero sized objects, let the range adhere as per the RFC

Browse Source 
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
This commit is contained in:
root 2016-07-27 18:04:19 +05:30
parent a94ec15a3b
commit 67bfbf4102
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rgw/rgw_rest.cc
View File

@ -655,7 +655,9 @@ void end_header(struct req_state* s, RGWOp* op, const char *content_type,
s->formatter->close_section();
}
s->formatter->output_footer();
dump_content_length(s, s->formatter->get_len());
if (s->obj_size) {
dump_content_length(s, s->formatter->get_len());
}
} else {
if (proposed_content_length != NO_CONTENT_LENGTH) {
dump_content_length(s, proposed_content_length);
@ -769,8 +771,13 @@ void dump_range(struct req_state *s, uint64_t ofs, uint64_t end,
/* dumping range into temp buffer first, as libfcgi will fail to digest
* %lld */
snprintf(range_buf, sizeof(range_buf), "%lld-%lld/%lld", (long long)ofs,
(long long)end, (long long)total);
if (!total) {
snprintf(range_buf, sizeof(range_buf), "*/%lld", (long long)total);
} else {
snprintf(range_buf, sizeof(range_buf), "%lld-%lld/%lld", (long long)ofs,
(long long)end, (long long)total);
}
int r = STREAM_IO(s)->print("Content-Range: bytes %s\r\n", range_buf);
if (r < 0) {
ldout(s->cct, 0) << "ERROR: s->cio->print() returned err=" << r << dendl;