Skip to content

Commit bdba93c

Browse files
bugfix: the modifications in this PR are to supplement the overlooked changes in the commit e8f65dc.
1 parent 18ce5fb commit bdba93c

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

src/ngx_http_lua_accessby.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
106106
}
107107

108108
if (rc == NGX_OK) {
109-
if (r->header_sent || r->headers_out.status != 0) {
109+
if (r->header_sent
110+
|| (r->headers_out.status != 0 && ctx->out != NULL))
111+
{
110112
dd("header already sent");
111113

112114
/* response header was already generated in access_by_lua*,
@@ -370,7 +372,8 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
370372

371373
#if 1
372374
if (rc == NGX_OK) {
373-
if (r->header_sent || r->headers_out.status != 0) {
375+
if (r->header_sent || (r->headers_out.status != 0 && ctx->out != NULL))
376+
{
374377
dd("header already sent");
375378

376379
/* response header was already generated in access_by_lua*,

src/ngx_http_lua_rewriteby.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
107107
}
108108

109109
if (rc == NGX_DECLINED) {
110-
if (r->header_sent || r->headers_out.status != 0) {
110+
if (r->header_sent
111+
|| (r->headers_out.status != 0 && ctx->out != NULL))
112+
{
111113
dd("header already sent");
112114

113115
/* response header was already generated in rewrite_by_lua*,
@@ -349,7 +351,9 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
349351
}
350352

351353
if (rc == NGX_OK || rc == NGX_DECLINED) {
352-
if (r->header_sent || r->headers_out.status != 0) {
354+
if (r->header_sent
355+
|| (r->headers_out.status != 0 && ctx->out != NULL))
356+
{
353357
dd("header already sent");
354358

355359
/* response header was already generated in rewrite_by_lua*,

src/ngx_http_lua_server_rewriteby.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ ngx_http_lua_server_rewrite_handler(ngx_http_request_t *r)
6969
}
7070

7171
if (rc == NGX_DECLINED) {
72-
if (r->header_sent || r->headers_out.status != 0) {
72+
if (r->header_sent
73+
|| (r->headers_out.status != 0 && ctx->out != NULL))
74+
{
7375
dd("header already sent");
7476

7577
/* response header was already generated in rewrite_by_lua*,
@@ -307,7 +309,9 @@ ngx_http_lua_server_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
307309
}
308310

309311
if (rc == NGX_OK || rc == NGX_DECLINED) {
310-
if (r->header_sent || r->headers_out.status != 0) {
312+
if (r->header_sent
313+
|| (r->headers_out.status != 0 && ctx->out != NULL))
314+
{
311315
dd("header already sent");
312316

313317
/* response header was already generated in rewrite_by_lua*,

0 commit comments

Comments
 (0)