mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-13 02:39:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Perl: request body handling fixed.

Browse Source 
As of 1.3.9, chunked request body may be available with
r->headers_in.content_length_n <= 0.  Additionally, request body
may be in multiple buffers even if r->request_body_in_single_buf
was requested.
This commit is contained in:
Maxim Dounin 2013-04-23 10:04:12 +00:00
parent 9d4e3c3612
commit e584341792
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/http/modules/perl/nginx.xs
View File

@ -357,7 +357,7 @@ has_request_body(r, next)
ngx_http_perl_set_request(r); ngx_http_perl_set_request(r);
if (r->headers_in.content_length_n <= 0) { if (r->headers_in.content_length_n <= 0 && !r->headers_in.chunked) {
XSRETURN_UNDEF; XSRETURN_UNDEF;
} }
@ -386,7 +386,10 @@ request_body(r)
dXSTARG; dXSTARG;
ngx_http_request_t *r; ngx_http_request_t *r;
u_char *p, *data;
size_t len; size_t len;
ngx_buf_t *buf;
ngx_chain_t *cl;
ngx_http_perl_set_request(r); ngx_http_perl_set_request(r);
@ -397,13 +400,43 @@ request_body(r)
XSRETURN_UNDEF; XSRETURN_UNDEF;
} }
len = r->request_body->bufs->buf->last - r->request_body->bufs->buf->pos; cl = r->request_body->bufs;
buf = cl->buf;
if (cl->next == NULL) {
len = buf->last - buf->pos;
data = buf->pos;
goto done;
}
len = buf->last - buf->pos;
cl = cl->next;
for ( /* void */ ; cl; cl = cl->next) {
buf = cl->buf;
len += buf->last - buf->pos;
}
p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
return XSRETURN_UNDEF;
}
data = p;
cl = r->request_body->bufs;
for ( /* void */ ; cl; cl = cl->next) {
buf = cl->buf;
p = ngx_cpymem(p, buf->pos, buf->last - buf->pos);
}
done:
if (len == 0) { if (len == 0) {
XSRETURN_UNDEF; XSRETURN_UNDEF;
} }
ngx_http_perl_set_targ(r->request_body->bufs->buf->pos, len); ngx_http_perl_set_targ(data, len);
ST(0) = TARG; ST(0) = TARG;