[nginx] svn commit: r5111 - trunk/src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-03-14 12:28:53 +0000 (Thu, 14 Mar 2013)
New Revision: 5111
URL: http://trac.nginx.org/nginx/changeset/5111/nginx

Log:
Request body: next upstream fix.

After introduction of chunked request body handling in 1.3.9 (r4931),
r->request_body->bufs buffers have b->start pointing to original buffer
start (and b->pos pointing to real data of this particular buffer).

While this is ok as per se, it caused bad things (usually original request
headers included before the request body) after reinit of the request
chain in ngx_http_upstream_reinit() while sending the request to a next
upstream server (which used to do b->pos = b->start for each buffer
in the request chain).

Patch by Piotr Sikora.


Modified:
   trunk/src/http/ngx_http_request_body.c

Modified: trunk/src/http/ngx_http_request_body.c
===================================================================
--- trunk/src/http/ngx_http_request_body.c	2013-03-12 13:38:04 UTC (rev 5110)
+++ trunk/src/http/ngx_http_request_body.c	2013-03-14 12:28:53 UTC (rev 5111)
@@ -826,7 +826,7 @@
 
         b->temporary = 1;
         b->tag = (ngx_buf_tag_t) &ngx_http_read_client_request_body;
-        b->start = cl->buf->start;
+        b->start = cl->buf->pos;
         b->pos = cl->buf->pos;
         b->last = cl->buf->last;
         b->end = cl->buf->end;
@@ -933,7 +933,7 @@
 
                 b->temporary = 1;
                 b->tag = (ngx_buf_tag_t) &ngx_http_read_client_request_body;
-                b->start = cl->buf->start;
+                b->start = cl->buf->pos;
                 b->pos = cl->buf->pos;
                 b->last = cl->buf->last;
                 b->end = cl->buf->end;