change exit status in body filter

Author: rainingmaster

src/ngx_http_lua_bodyfilterby.c

@@ -87,7 +87,6 @@ ngx_http_lua_body_filter_by_chunk(lua_State *L, ngx_http_request_t *r,
     ngx_chain_t *in)
 {
     ngx_int_t                    rc;
-    ngx_chain_t                 *cl;
     u_char                      *err_msg;
     size_t                       len;
 #if (NGX_PCRE)
@@ -146,20 +145,8 @@ ngx_http_lua_body_filter_by_chunk(lua_State *L, ngx_http_request_t *r,
 
     lua_settop(L, 0);
 
-    if (ctx->body_filter_aborted) {
-        /* send last content */
-        for (cl = in; cl->next; cl = cl->next) {
-            /* do nothing */
-        }
-        /* make ngx_http_write_filter_module happy */
-        cl->buf->last_buf = 1;
-
-        ctx->eof = 1;
-
-        return NGX_OK;
-    }
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+    if (ctx->body_filter_aborted || rc == NGX_ERROR
+        || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
         return NGX_ERROR;
     }
 

t/082-body-filter.t

@@ -10,7 +10,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 11);
+plan tests => repeat_each() * (blocks() * 3 + 8);
 
 #no_diff();
 no_long_string();
@@ -855,9 +855,7 @@ API disabled in the context of body_filter_by_lua*
     }
 --- request
     GET /t
---- response_body
-111
---- error_code: 200
+--- ignore_response
 --- no_error_log
 [error]
 [alert]
@@ -882,31 +880,3 @@ API disabled in the context of body_filter_by_lua*
 --- ignore_response
 --- error_log
 attempt to exit with the code not 444 or ngx.ERROR
-
-
-
-=== TEST 29: in 2nd times
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say("111")
-            ngx.say("222")
-            ngx.say("333")
-        }
-
-        body_filter_by_lua_block {
-            ngx.ctx.times = (ngx.ctx.times or 0) + 1
-            if ngx.ctx.times == 2 then
-                ngx.exit(444)
-            end
-        }
-    }
---- request
-    GET /t
---- response_body
-111
-222
---- error_code: 200
---- no_error_log
-[error]
-[alert]