Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hammer: rgw: refrain from sending Content-Type/Content-Length for 304 responses #8379

Merged
merged 6 commits into from Jul 29, 2016
Merged

hammer: rgw: refrain from sending Content-Type/Content-Length for 304 responses #8379

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ceb8e19
rgw: Do not send a Content-Length header on status 204
wido Nov 11, 2015
c79b481
rgw: move status_num initialization into constructor
yehudasa Dec 18, 2015
19dbc25
rgw: dump_status() uses integer
yehudasa Dec 18, 2015
e53751d
rgw: Do not send a Content-Type on a '304 Not Modified' response
wido Mar 21, 2016
20f300e
rgw: Do not send a Content-Length header on a 304 response
wido Mar 22, 2016
24cc4f9
rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc
smithfarm Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/rgw/rgw_rest_s3.cc
View file
Open in desktop
Expand Up @@ -167,10 +167,14 @@ int RGWGetObj_ObjStore_S3::send_response_data(bufferlist& bl, off_t bl_ofs, off_
s->cio->print("%s: %s\r\n", riter->first.c_str(), riter->second.c_str());
}

if (!content_type)
content_type = "binary/octet-stream";
if (ret == ERR_NOT_MODIFIED) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure this should be ret == -ERR_NOT_MODIFIED

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind creating an issue at http://tracker.ceph.com/projects/rgw/issues/new for that ? It's in master and should be fixed there.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dachary Issue is http://tracker.ceph.com/issues/16327, fixed by #9725

end_header(s, this);
} else {
if (!content_type)
content_type = "binary/octet-stream";

end_header(s, this, content_type);
end_header(s, this, content_type);
}

if (metadata_bl.length()) {
s->cio->write(metadata_bl.c_str(), metadata_bl.length());
Expand Down