refactor: removed our own ctx->headers_sent field because we should used r->header_sent instead.

Author: agentzh

src/ngx_http_lua_common.h

@@ -356,9 +356,6 @@ typedef struct ngx_http_lua_ctx_s {
 
     unsigned         exited:1;
 
-    unsigned         headers_sent:1;    /*  1: response header has been sent;
-                                            0: header not sent yet */
-
     unsigned         eof:1;             /*  1: last_buf has been sent;
                                             0: last_buf not sent yet */
 

src/ngx_http_lua_control.c

@@ -108,7 +108,6 @@ ngx_http_lua_ngx_exec(lua_State *L)
     if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags)
         != NGX_OK)
     {
-        ctx->headers_sent = 1;
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
@@ -173,7 +172,7 @@ ngx_http_lua_ngx_exec(lua_State *L)
         }
     }
 
-    if (ctx->headers_sent) {
+    if (r->header_sent) {
         return luaL_error(L, "attempt to call ngx.exec after "
                           "sending out response headers");
     }
@@ -237,7 +236,7 @@ ngx_http_lua_ngx_redirect(lua_State *L)
 
     ngx_http_lua_check_if_abortable(L, ctx);
 
-    if (ctx->headers_sent) {
+    if (r->header_sent) {
         return luaL_error(L, "attempt to call ngx.redirect after sending out "
                           "the headers");
     }
@@ -319,7 +318,7 @@ ngx_http_lua_ngx_exit(lua_State *L)
         return luaL_error(L, "attempt to abort with pending subrequests");
     }
 
-    if (ctx->headers_sent
+    if (r->header_sent
         && rc >= NGX_HTTP_SPECIAL_RESPONSE
         && rc != NGX_HTTP_REQUEST_TIME_OUT
         && rc != NGX_HTTP_CLIENT_CLOSED_REQUEST

src/ngx_http_lua_headers.c

@@ -452,7 +452,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
 
     ngx_http_lua_check_fake_request2(L, r, ctx);
 
-    if (ctx->headers_sent) {
+    if (r->header_sent) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "attempt to "
                       "set ngx.header.HEADER after sending out "
                       "response headers");

src/ngx_http_lua_misc.c

@@ -81,9 +81,9 @@ ngx_http_lua_ngx_get(lua_State *L)
 
         ngx_http_lua_check_fake_request2(L, r, ctx);
 
-        dd("headers sent: %d", ctx->headers_sent);
+        dd("headers sent: %d", r->header_sent);
 
-        lua_pushboolean(L, ctx->headers_sent ? 1 : 0);
+        lua_pushboolean(L, r->header_sent ? 1 : 0);
         return 1;
     }
 
@@ -115,7 +115,7 @@ ngx_http_lua_ngx_set(lua_State *L)
 
         ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
 
-        if (ctx->headers_sent) {
+        if (r->header_sent) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "attempt to set ngx.status after sending out "
                           "response headers");

src/ngx_http_lua_output.c

@@ -515,7 +515,7 @@ ngx_http_lua_ngx_flush(lua_State *L)
     }
 
 #if 1
-    if (!ctx->headers_sent) {
+    if (!r->header_sent) {
         lua_pushnil(L);
         lua_pushliteral(L, "nothing to flush");
         return 2;
@@ -708,7 +708,7 @@ ngx_http_lua_ngx_send_headers(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT);
 
-    if (!ctx->headers_sent) {
+    if (!r->header_sent) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "lua send headers");
 

src/ngx_http_lua_util.c

@@ -475,7 +475,7 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
 {
     ngx_int_t            rc;
 
-    if (!ctx->headers_sent) {
+    if (!r->header_sent) {
         if (r->headers_out.status == 0) {
             r->headers_out.status = NGX_HTTP_OK;
         }
@@ -492,7 +492,6 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
         if (!ctx->buffering) {
             dd("sending headers");
             rc = ngx_http_send_header(r);
-            ctx->headers_sent = 1;
             return rc;
         }
     }
@@ -525,7 +524,7 @@ ngx_http_lua_send_chain_link(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
 
     if (llcf->http10_buffering
         && !ctx->buffering
-        && !ctx->headers_sent
+        && !r->header_sent
         && r->http_version < NGX_HTTP_VERSION_11
         && r->headers_out.content_length_n < 0)
     {
@@ -662,7 +661,7 @@ ngx_http_lua_send_http10_headers(ngx_http_request_t *r,
     ngx_chain_t         *cl;
     ngx_int_t            rc;
 
-    if (ctx->headers_sent) {
+    if (r->header_sent) {
         return NGX_OK;
     }
 
@@ -687,7 +686,6 @@ ngx_http_lua_send_http10_headers(ngx_http_request_t *r,
 
 send:
     rc = ngx_http_send_header(r);
-    ctx->headers_sent = 1;
     return rc;
 }
 
@@ -1436,15 +1434,15 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
 
                 ngx_http_lua_request_cleanup(ctx, 0);
 
-                dd("headers sent? %d", ctx->headers_sent ? 1 : 0);
+                dd("headers sent? %d", r->header_sent ? 1 : 0);
 
                 if (ctx->no_abort) {
                     ctx->no_abort = 0;
                     return NGX_ERROR;
                 }
 
-                return ctx->headers_sent ? NGX_ERROR :
-                            NGX_HTTP_INTERNAL_SERVER_ERROR;
+                return r->header_sent ? NGX_ERROR :
+                       NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
 
             /* being a user coroutine that has a parent */
@@ -1497,7 +1495,7 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "lua handler aborted: "
                   "user coroutine has no parent");
 
-    return ctx->headers_sent ? NGX_ERROR : NGX_HTTP_INTERNAL_SERVER_ERROR;
+    return r->header_sent ? NGX_ERROR : NGX_HTTP_INTERNAL_SERVER_ERROR;
 
 done:
     if (ctx->entered_content_phase && r->connection->fd != -1) {
@@ -2212,7 +2210,7 @@ ngx_http_lua_handle_exit(lua_State *L, ngx_http_request_t *r,
                    ctx->exit_code);
 
 #if 1
-    if (!ctx->headers_sent
+    if (!r->header_sent
         && r->headers_out.status == 0
         && ctx->exit_code >= NGX_HTTP_OK)
     {