rename body_exited to body_filter_aborted

Author: rainingmaster

src/ngx_http_lua_bodyfilterby.c

@@ -146,7 +146,7 @@ ngx_http_lua_body_filter_by_chunk(lua_State *L, ngx_http_request_t *r,
 
     lua_settop(L, 0);
 
-    if (ctx->body_exited) {
+    if (ctx->body_filter_aborted) {
         /* send last content */
         for (cl = in; cl->next; cl = cl->next) {
             /* do nothing */
@@ -271,7 +271,7 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         }
     }
 
-    if (ctx->body_exited) {
+    if (ctx->body_filter_aborted) {
         return NGX_ERROR;
     }
 

src/ngx_http_lua_common.h

@@ -487,7 +487,7 @@ typedef struct ngx_http_lua_ctx_s {
 
     unsigned         exited:1;
 
-    unsigned         body_exited:1;
+    unsigned         body_filter_aborted:1;
 
     unsigned         eof:1;             /*  1: last_buf has been sent;
                                             0: last_buf not sent yet */

src/ngx_http_lua_control.c

@@ -329,12 +329,12 @@ ngx_http_lua_ngx_exit(lua_State *L)
 
     if (ctx->context & NGX_HTTP_LUA_CONTEXT_BODY_FILTER) {
 
-        if (rc != NGX_ERROR && rc < 400) {
-            return luaL_error(L, "attempt to exit with the code smaller "
-                              "than 400 and not ngx.ERROR");
+        if (rc != NGX_ERROR && rc != NGX_HTTP_CLOSE) {
+            return luaL_error(L, "attempt to exit with the code not 444 "
+                                 "or ngx.ERROR");
         }
 
-        ctx->body_exited = 1;
+        ctx->body_filter_aborted = 1;
         ctx->exit_code = rc;
         ctx->exited = 1;
         return 0;
@@ -497,14 +497,14 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
 
     if (ctx->context & NGX_HTTP_LUA_CONTEXT_BODY_FILTER) {
 
-        if (status != NGX_ERROR && status < 400) {
+        if (status != NGX_ERROR && status < NGX_HTTP_CLOSE) {
             *errlen = ngx_snprintf(err, *errlen, "attempt to exit with the "
-                                   "code smaller than 400 and not ngx.ERROR")
+                                   "code not 444 or ngx.ERROR")
                       - err;
             return NGX_ERROR;
         }
 
-        ctx->body_exited = 1;
+        ctx->body_filter_aborted = 1;
         return NGX_OK;
     }
 

t/082-body-filter.t

@@ -881,7 +881,7 @@ API disabled in the context of body_filter_by_lua*
     GET /t
 --- ignore_response
 --- error_log
-attempt to exit with the code smaller than 400 and not ngx.ERROR
+attempt to exit with the code not 444 or ngx.ERROR