now we back-ported the subrequest mechanism of ngx_lua to ngx_echo. this also helps some crazy test cases of mixing echo_location and echo_location_async pass now :)

Author: agentzh

src/ngx_http_echo_echo.c

@@ -11,6 +11,7 @@ static ngx_buf_t ngx_http_echo_space_buf;
 
 static ngx_buf_t ngx_http_echo_newline_buf;
 
+
 ngx_int_t
 ngx_http_echo_echo_init(ngx_conf_t *cf)
 {
@@ -20,19 +21,25 @@ ngx_http_echo_echo_init(ngx_conf_t *cf)
     dd("global init...");
 
     ngx_memzero(&ngx_http_echo_space_buf, sizeof(ngx_buf_t));
+
     ngx_http_echo_space_buf.memory = 1;
+
     ngx_http_echo_space_buf.start =
         ngx_http_echo_space_buf.pos =
             space_str;
+
     ngx_http_echo_space_buf.end =
         ngx_http_echo_space_buf.last =
             space_str + sizeof(space_str) - 1;
 
     ngx_memzero(&ngx_http_echo_newline_buf, sizeof(ngx_buf_t));
+
     ngx_http_echo_newline_buf.memory = 1;
+
     ngx_http_echo_newline_buf.start =
         ngx_http_echo_newline_buf.pos =
             newline_str;
+
     ngx_http_echo_newline_buf.end =
         ngx_http_echo_newline_buf.last =
             newline_str + sizeof(newline_str) - 1;
@@ -119,6 +126,7 @@ ngx_http_echo_exec_echo(ngx_http_request_t *r,
             cl->buf  = buf;
             cl->next = NULL;
             ll = &cl->next;
+
         } else {
             /* append a space first */
             *ll = ngx_alloc_chain_link(r->pool);

src/ngx_http_echo_handler.c

@@ -50,6 +50,8 @@ ngx_http_echo_wev_handler(ngx_http_request_t *r)
         return;
     }
 
+    dd("waiting: %d, done: %d", (int) ctx->waiting, (int) ctx->done);
+
     if (ctx->waiting && ! ctx->done) {
         if (r == r->connection->data && r->postponed) {
             if (r->postponed->request) {
@@ -337,13 +339,17 @@ ngx_http_echo_post_subrequest(ngx_http_request_t *r,
     ngx_http_request_t          *pr;
     ngx_http_echo_ctx_t         *pr_ctx;
 
-    dd_enter();
+    dd("echo post_subrequest: %.*s", (int) r->uri.len, r->uri.data);
 
-#if 0
     if (ctx->run_post_subrequest) {
+        dd("already run post_subrequest: %p: %.*s", ctx,
+                (int) r->uri.len, r->uri.data);
+
         return rc;
     }
-#endif
+
+    dd("setting run_post_subrequest to 1 for %p for %.*s", ctx,
+            (int) r->uri.len, r->uri.data);
 
     ctx->run_post_subrequest = 1;
 
@@ -361,16 +367,17 @@ ngx_http_echo_post_subrequest(ngx_http_request_t *r,
 
     pr->write_event_handler = ngx_http_echo_wev_handler;
 
-    /* ensure that the parent request is (or will be)
-     *  posted out the head of the r->posted_requests chain */
+    /* work-around issues in nginx's event module */
 
-    if (r->main->posted_requests
-            && r->main->posted_requests->request != pr)
+    if (r != r->connection->data && r->postponed &&
+            (r->main->posted_requests == NULL ||
+            r->main->posted_requests->request != pr))
     {
-        rc = ngx_http_echo_post_request_at_head(pr, NULL);
-        if (rc != NGX_OK) {
-            return NGX_ERROR;
-        }
+#if defined(nginx_version) && nginx_version >= 8012
+        ngx_http_post_request(pr, NULL);
+#else
+        ngx_http_post_request(pr);
+#endif
     }
 
     return rc;

src/ngx_http_echo_location.c

@@ -88,9 +88,7 @@ ngx_http_echo_exec_echo_location(ngx_http_request_t *r,
     ngx_http_post_subrequest_t          *psr;
     ngx_str_t                            args;
     ngx_uint_t                           flags = 0;
-
-
-    dd_enter();
+    ngx_http_echo_ctx_t                 *sr_ctx;
 
     computed_arg_elts = computed_args->elts;
 
@@ -124,14 +122,16 @@ ngx_http_echo_exec_echo_location(ngx_http_request_t *r,
         return rc;
     }
 
+    sr_ctx = ngx_http_echo_create_ctx(r);
+
     psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
 
     if (psr == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
     psr->handler = ngx_http_echo_post_subrequest;
-    psr->data = ctx;
+    psr->data = sr_ctx;
 
     rc = ngx_http_subrequest(r, &location, url_args, &sr, psr, 0);
 

src/ngx_http_echo_subrequest.c

@@ -57,7 +57,6 @@ ngx_http_echo_exec_echo_subrequest_async(ngx_http_request_t *r,
     ngx_str_t                       args;
     ngx_uint_t                      flags = 0;
 
-
     dd_enter();
 
     rc = ngx_http_echo_parse_subrequest_spec(r, computed_args, &parsed_sr);
@@ -152,6 +151,9 @@ ngx_http_echo_exec_echo_subrequest(ngx_http_request_t *r,
      *  sr_ctx->run_post_subrequest = 0
      */
 
+    dd("creating sr ctx for %.*s: %p", (int) parsed_sr->location->len,
+            parsed_sr->location->data, sr_ctx);
+
     psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
 
     if (psr == NULL) {

t/echo-sleep.t

@@ -161,13 +161,12 @@ done
     location /quit {
         echo before;
         echo_flush;
-        echo_sleep 5;
+        echo_sleep 1;
         echo after;
     }
 --- request
     GET /quit
 --- response_body
 before
---- timeout: 1
---- SKIP
+after
 

t/location-async.t

@@ -304,7 +304,7 @@ post main
 
 
 
-=== TEST 17: access/deny
+=== TEST 17: access/deny (access phase handlers skipped in subrequests)
 --- config
     location /main {
         echo_location_async /denied;
@@ -315,9 +315,9 @@ post main
     }
 --- request
     GET /main
---- error_code: 403
+--- error_code: 200
 --- response_body
---- SKIP
+No no no
 
 
 

t/location.t

@@ -437,7 +437,6 @@ GET /main
 6
 7
 --- timeout: 2
---- SKIP
 
 
 
@@ -522,6 +521,14 @@ hi(world);
         echo_location /foo;
         echo_location /bar;
     }
+    location /main2 {
+        content_by_lua '
+            local res = ngx.location.capture("/foo")
+            local res2 = ngx.location.capture("/bar")
+            ngx.say(res.body)
+            ngx.say(res2.body)
+        ';
+    }
     location /foo {
         echo -n world;
     }