bugfix: the request body was not discarded properly in the content handler when the request body was not read yet. thanks Peter Sabaini for the report in openresty/openresty#32. bugfix: ensure that subrequests never read the main request's request body by automatically reading the main request body before initiating subrequests.

Author: agentzh

src/ngx_http_echo_handler.c

@@ -239,21 +239,53 @@ ngx_http_echo_run_cmds(ngx_http_request_t *r)
             break;
 
         case echo_opcode_echo_location_async:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
             dd("found opcode echo location async...");
             rc = ngx_http_echo_exec_echo_location_async(r, ctx,
                     computed_args);
             break;
 
         case echo_opcode_echo_location:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
             return ngx_http_echo_exec_echo_location(r, ctx, computed_args);
 
         case echo_opcode_echo_subrequest_async:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
             dd("found opcode echo subrequest async...");
             rc = ngx_http_echo_exec_echo_subrequest_async(r, ctx,
                     computed_args);
             break;
 
         case echo_opcode_echo_subrequest:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
             return ngx_http_echo_exec_echo_subrequest(r, ctx, computed_args);
 
         case echo_opcode_echo_sleep:
@@ -277,6 +309,8 @@ ngx_http_echo_run_cmds(ngx_http_request_t *r)
             break;
 
         case echo_opcode_echo_read_request_body:
+
+read_request_body:
             ctx->wait_read_request_body = 0;
 
             rc = ngx_http_echo_exec_echo_read_request_body(r, ctx);
@@ -329,6 +363,12 @@ ngx_http_echo_run_cmds(ngx_http_request_t *r)
         return rc;
     }
 
+    if (!r->request_body) {
+        if (ngx_http_discard_request_body(r) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
     return NGX_OK;
 }
 

t/echo.t

@@ -3,9 +3,9 @@
 use lib 'lib';
 use Test::Nginx::Socket;
 
-repeat_each(1);
+repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 1);
+plan tests => repeat_each() * (2 * blocks() + 5);
 
 #$Test::Nginx::LWP::LogLevel = 'debug';
 
@@ -338,3 +338,34 @@ world
     HEAD /echo
 --- response_body
 
+
+
+=== TEST 24: POST
+--- config
+    location /echo {
+        echo hello;
+        echo world;
+    }
+--- pipelined_requests eval
+["POST /echo
+blah blah", "POST /echo
+foo bar baz"]
+--- response_body eval
+["hello\nworld\n","hello\nworld\n"]
+
+
+
+=== TEST 25: POST
+--- config
+    location /echo {
+        echo_sleep 0.001;
+        echo hello;
+        echo world;
+    }
+--- pipelined_requests eval
+["POST /echo
+blah blah", "POST /echo
+foo bar baz"]
+--- response_body eval
+["hello\nworld\n","hello\nworld\n"]
+

t/request-info.t

@@ -427,10 +427,9 @@ Content-Length: 5\r
 
 
 
-=== TEST 20: small header (POST body) - in subrequests
+=== TEST 20: small header (POST body) - in subrequests (location)
 --- config
     location /t {
-        echo_read_request_body;
         echo -n $echo_client_request_headers;
     }
     location /main {
@@ -535,3 +534,75 @@ Cookie: " . ("C" x 1200) . "\r\n\r\n"
 --- no_error_log
 [error]
 
+
+
+=== TEST 24: small header (POST body) - in subrequests (location_async)
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+    location /main {
+        echo_location_async /t;
+    }
+
+--- request
+POST /main
+hello
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: Close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 25: small header (POST body) - in subrequests (subrequest)
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+    location /main {
+        echo_subrequest GET /t;
+    }
+
+--- request
+POST /main
+hello
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: Close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 26: small header (POST body) - in subrequests (subrequest_async)
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+    location /main {
+        echo_subrequest_async GET /t;
+    }
+
+--- request
+POST /main
+hello
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: Close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+