# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1352393278 -14400
# Node ID a1c71119ec4c40d0410a6575c583bd65ac6cb690
# Parent 72ea28f498c7638656676c32e17abcf695b1ff32
Request body: $request_body variable generalization.

The $request_body variable was assuming there can't be more than two
buffers. While this is currently true due to request body reading
implementation details, this is not a good thing to depend on and may
change in the future.

diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -1767,7 +1767,7 @@ ngx_http_variable_request_body(ngx_http_
{
u_char *p;
size_t len;
- ngx_buf_t *buf, *next;
+ ngx_buf_t *buf;
ngx_chain_t *cl;

if (r->request_body == NULL
@@ -1792,8 +1792,13 @@ ngx_http_variable_request_body(ngx_http_
return NGX_OK;
}

- next = cl->next->buf;
- len = (buf->last - buf->pos) + (next->last - next->pos);
+ 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) {
@@ -1801,9 +1806,12 @@ ngx_http_variable_request_body(ngx_http_
}

v->data = p;
-
- p = ngx_cpymem(p, buf->pos, buf->last - buf->pos);
- ngx_memcpy(p, next->pos, next->last - next->pos);
+ cl = r->request_body->bufs;
+
+ for ( /* void */ ; cl; cl = cl->next) {
+ buf = cl->buf;
+ p = ngx_cpymem(p, buf->pos, buf->last - buf->pos);
+ }

v->len = len;
v->valid = 1;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel