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

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-04-16 10:14:59 +0000 (Tue, 16 Apr 2013)
New Revision: 5175
URL: http://trac.nginx.org/nginx/changeset/5175/nginx

Log:
Request body: only read body in main request (ticket #330).

Before 1.3.9 an attempt to read body in a subrequest only caused problems
if body wasn't already read or discarded in a main request.  Starting with
1.3.9 it might also cause problems if body was discarded by a main request
before subrequest start.

Fix is to just ignore attempts to read request body in a subrequest, which
looks like right thing to do anyway.


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-04-12 19:12:13 UTC (rev 5174)
+++ trunk/src/http/ngx_http_request_body.c	2013-04-16 10:14:59 UTC (rev 5175)
@@ -49,7 +49,7 @@
     }
 #endif
 
-    if (r->request_body || r->discard_body) {
+    if (r != r->main || r->request_body || r->discard_body) {
         post_handler(r);
         return NGX_OK;
     }