fixed the CPS-style chained subrequest model for the "echo_location" …

…and "echo_subrequest" directives. they are now working with nginx 0.8.27 now. yay!
openresty · Nov 19, 2009 · e73092f · e73092f
1 parent 1025afd
commit e73092f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/src/location.c b/src/location.c
@@ -134,11 +134,17 @@ static ngx_int_t
 ngx_http_echo_post_subrequest(ngx_http_request_t *r,
         void *data, ngx_int_t rc) {
     ngx_http_echo_ctx_t         *ctx;
+    ngx_int_t                   parent_rc;
 
     ctx = data;
     ctx->next_handler_cmd++;
 
-    return ngx_http_echo_handler(r->parent);
+    parent_rc = ngx_http_echo_handler(r->parent);
+    if (parent_rc != NGX_DONE) {
+        ngx_http_finalize_request(r->parent, parent_rc);
+    }
+
+    return rc;
 }
 
 static ngx_int_t

diff --git a/src/subrequest.c b/src/subrequest.c
@@ -151,11 +151,17 @@ static ngx_int_t
 ngx_http_echo_post_subrequest(ngx_http_request_t *r,
         void *data, ngx_int_t rc) {
     ngx_http_echo_ctx_t         *ctx;
+    ngx_int_t                   parent_rc;
 
     ctx = data;
     ctx->next_handler_cmd++;
 
-    return ngx_http_echo_handler(r->parent);
+    parent_rc = ngx_http_echo_handler(r->parent);
+    if (parent_rc != NGX_DONE) {
+        ngx_http_finalize_request(r->parent, parent_rc);
+    }
+
+    return rc;
 }
 
 static ngx_int_t

diff --git a/test/t/echo-location.t b/test/t/echo-location.t
@@ -2,8 +2,7 @@
 
 use lib 'lib';
 
-use Test::Nginx::Echo skip_all =>
-    "echo_subrequest is now deprecated.";
+use Test::Nginx::Echo;
 
 plan tests => 1 * blocks();
 

diff --git a/test/t/echo-subrequest.t b/test/t/echo-subrequest.t
@@ -2,8 +2,7 @@
 
 use lib 'lib';
 
-use Test::Nginx::Echo skip_all =>
-    "echo_subrequest is now deprecated.";
+use Test::Nginx::Echo;
 
 plan tests => 1 * blocks();
 

diff --git a/util/build.sh b/util/build.sh
@@ -14,8 +14,8 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile \
         || "$root/util/build.sh" -nt Makefile ]]; then
     ./configure --prefix=/opt/nginx \
           --with-http_addition_module \
-          --add-module=$root $opts #\
-          #--with-debug
+          --add-module=$root $opts \
+          --with-debug
   #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
 
 fi