do not send empty chain link in echo_after_body because it may trigger the infamous "the http output chain is empty" alert in error.log when the standard ngx_ssi module is disabled. thanks Sparsh Gupta.

agentzh · agentzh · commit 03a2fd24c172 · 2011-09-13T17:12:58.000+08:00
diff --git a/src/ngx_http_echo_echo.c b/src/ngx_http_echo_echo.c
@@ -66,6 +66,7 @@ ngx_http_echo_exec_echo_sync(ngx_http_request_t *r,
     if (cl == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
+
     cl->buf  = buf;
     cl->next = NULL;
 
diff --git a/src/ngx_http_echo_filter.c b/src/ngx_http_echo_filter.c
@@ -138,6 +138,8 @@ ngx_http_echo_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     prev = NULL;
     for (cl = in; cl; prev = cl, cl = cl->next) {
+        dd("prev %p, cl %p, special %d", prev, cl, ngx_buf_special(cl->buf));
+
         if (cl->buf->last_buf) {
             if (ngx_buf_special(cl->buf)) {
                 if (prev) {
@@ -155,12 +157,16 @@ ngx_http_echo_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         }
     }
 
-    rc = ngx_http_echo_next_body_filter(r, in);
+    dd("in %p, last %d", in, (int) last);
 
-    dd("next filter returns %d, last %d", (int) rc, (int) last);
+    if (in) {
+        rc = ngx_http_echo_next_body_filter(r, in);
 
-    if (rc == NGX_ERROR || rc > NGX_OK || !last) {
-        return rc;
+        dd("next filter returns %d, last %d", (int) rc, (int) last);
+
+        if (rc == NGX_ERROR || rc > NGX_OK || !last) {
+            return rc;
+        }
     }
 
     dd("exec filter cmds for after body cmds");
diff --git a/t/echo-after-body.t b/t/echo-after-body.t
@@ -208,3 +208,21 @@ hello
 hello
 --- SKIP
 
+
+
+=== TEST 13: echo_after_body + lua output
+--- config
+    gzip             on;
+    gzip_min_length  1;
+    location /main {
+        echo_after_body 'world';
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+    location /foo {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body_like
+hello
+
diff --git a/util/build.sh b/util/build.sh
@@ -7,6 +7,7 @@ version=$1
 force=$2
 home=~
 
+  #--without-http_ssi_module \
 ngx-build $force $version \
             --with-cc-opt="-DDEBUG_MALLOC" \
             --with-http_stub_status_module \
@@ -35,5 +36,4 @@ ngx-build $force $version \
           #--add-module=$home/work/ndk/examples/http/set_var \
           #--add-module=$root/../eval-nginx-module \
           #--add-module=/home/agentz/work/nginx_eval_module-1.0.1 \
-  #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ ngx_http_echo_exec_echo_sync(ngx_http_request_t *r,`
`66`	`66`	`if (cl == NULL) {`
`67`	`67`	`return NGX_HTTP_INTERNAL_SERVER_ERROR;`
`68`	`68`	`}`
	`69`	`+`
`69`	`70`	`cl->buf = buf;`
`70`	`71`	`cl->next = NULL;`
`71`	`72`