hammer: rgw: refrain from sending Content-Type/Content-Length for 304 responses #8379
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
just not sure if we add the notes in the cherry-picked commits |
|
@tchaikov Yes, I am not sure, too. |
RFC7230 says: A server MUST NOT send a Content-Length header field in any response with a status code of 1xx (Informational) or 204 (No Content). Fixes: ceph#13582 Signed-off-by: Wido den Hollander <wido@42on.com> (cherry picked from commit 4e5921d)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> (cherry picked from commit 2a12ffc)
so that we can avoid atoi() later Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> (cherry picked from commit 744a29a) Conflicts: src/rgw/rgw_rest.cc rename the input parameter from `err` to `http_ret`
When we say the Content has not changed we should not respond with a content type which defaults to binary/octet stream. Fixes: ceph#15119 Signed-off-by: Wido den Hollander <wido@42on.com> (cherry picked from commit 471fa29)
We tell the client that the content has not changed. If we send a Content-Length header RFC2616 describes that the client MUST use that new value: "If a cache uses a received 304 response to update a cache entry, the cache MUST update the entry to reflect any new field values given in the response." Therefor we should not send a Content-Length header Fixes: ceph#15119 Signed-off-by: Wido den Hollander <wido@42on.com> (cherry picked from commit fb4e5cc)
Vicente-Cheng
force-pushed
the
wip-15283-hammer
branch
from
ef716d7
to
20f300e
Compare
ghost
self-assigned this
|
The conflict resolution comment matches the difference commit=19dbc2598d15d0676017abe4fb75f7ddc3248119 ; picked_from=$(git show --no-patch --pretty=%b $commit | perl -ne 'print if(s/.*cherry picked from commit (\w+).*/$1/)') ; diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit)
--- /dev/fd/63 2016-03-31 11:37:30.911948034 +0200
+++ /dev/fd/62 2016-03-31 11:37:30.927947932 +0200
@@ -149,11 +154,12 @@
+ dump_status(s, s->err.http_ret, http_status_names[s->err.http_ret]);
}
- void dump_errno(struct req_state *s, int http_ret)
+-void dump_errno(struct req_state *s, int err)
++void dump_errno(struct req_state *s, int http_ret)
{
- char buf[32];
-- snprintf(buf, sizeof(buf), "%d", http_ret);
-- dump_status(s, buf, http_status_names[http_ret]);
+- snprintf(buf, sizeof(buf), "%d", err);
+- dump_status(s, buf, http_status_names[s->err.http_ret]);
+ dump_status(s, http_ret, http_status_names[http_ret]);
} |
ghost
pushed a commit
that referenced
this pull request
Apr 5, 2016
… Content-Length for 304 responses Reviewed-by: Loic Dachary <ldachary@redhat.com>
| @@ -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) { | |||
There was a problem hiding this comment.
Pretty sure this should be ret == -ERR_NOT_MODIFIED
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
@dachary Issue is http://tracker.ceph.com/issues/16327, fixed by #9725
smithfarm
added a commit
that referenced
this pull request
Jun 1, 2016
… Content-Length for 304 responses Reviewed-by: Nathan Cutler <ncutler@suse.com>
|
@Vicente-Cheng Please cherry-pick fc38346 into this PR (see http://tracker.ceph.com/issues/16327) |
Fixes: http://tracker.ceph.com/issues/16327 Signed-off-by: Nathan Cutler <ncutler@suse.com> (cherry picked from commit fc38346) Conflicts: src/rgw/rgw_rest_s3.cc use ret instead of op_ret to check op result
|
@smithfarm sorry about late update. thanks |
smithfarm
added a commit
that referenced
this pull request
Jun 27, 2016
… Content-Length for 304 responses Reviewed-by: Nathan Cutler <ncutler@suse.com>
smithfarm
added a commit
that referenced
this pull request
Jul 18, 2016
… Content-Length for 304 responses Reviewed-by: Nathan Cutler <ncutler@suse.com>
smithfarm
added a commit
that referenced
this pull request
Jul 24, 2016
… Content-Length for 304 responses Reviewed-by: Nathan Cutler <ncutler@suse.com>
|
@oritwas This PR passed an rgw suite with some valgrind-related failures that appear harmless - see http://tracker.ceph.com/issues/15895#note-19 Do you think this PR is ready to merge? |
|
@oritwas Ping for permission to merge. |
|
lgtm |
smithfarm
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
http://tracker.ceph.com/issues/15283