RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-13 23:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: tolerate missing content-length header on canned ACL puts

Browse Source 
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
This commit is contained in:
Greg Farnum 2011-09-23 14:47:10 -07:00
parent e0be65cf0e
commit 05b06e807e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rgw/rgw_rest.cc
View File

@ -221,7 +221,7 @@ int RGWPutObj_REST::get_params()
int RGWPutObj_REST::get_data()
{
size_t cl;
size_t cl = 0;
if (s->length) {
cl = atoll(s->length) - ofs;
if (cl > RGW_MAX_CHUNK_SIZE)
@ -703,6 +703,10 @@ int RGWHandler_REST::preprocess(struct req_state *s, FCGX_Request *fcgx)
s->content_type = s->env->get("CONTENT_TYPE");
s->prot_flags = 0;
const char *cacl = s->env->get("HTTP_X_AMZ_ACL");
if (cacl)
s->canned_acl = cacl;
if (!s->method)
s->op = OP_UNKNOWN;
else if (strcmp(s->method, "GET") == 0)
@ -721,7 +725,7 @@ int RGWHandler_REST::preprocess(struct req_state *s, FCGX_Request *fcgx)
init_entities_from_header(s);
switch (s->op) {
case OP_PUT:
if (s->object) {
if (s->object && !s->canned_acl.length()) { //we can get a canned acl without data
if (!s->length)
ret = -ERR_LENGTH_REQUIRED;
else if (*s->length == '\0')
@ -749,10 +753,6 @@ int RGWHandler_REST::preprocess(struct req_state *s, FCGX_Request *fcgx)
init_auth_info(s);
const char *cacl = s->env->get("HTTP_X_AMZ_ACL");
if (cacl)
s->canned_acl = cacl;
s->copy_source = s->env->get("HTTP_X_AMZ_COPY_SOURCE");
s->http_auth = s->env->get("HTTP_AUTHORIZATION");