Skip to content

Commit dde6062

Browse files
committed
Revert "bugfix: header_filter_by_lua*: now we ensure we always forward the exact return value of the ngx_http_filter_finalize_request() calls."
This reverts commit e9fa313.
1 parent e9fa313 commit dde6062

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/ngx_http_lua_headerfilterby.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,13 @@ ngx_http_lua_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
143143

144144
dd("finalize request with %d", (int) ctx->exit_code);
145145

146-
return ngx_http_filter_finalize_request(r, &ngx_http_lua_module,
147-
ctx->exit_code);
146+
rc = ngx_http_filter_finalize_request(r, &ngx_http_lua_module,
147+
ctx->exit_code);
148+
if (rc == NGX_ERROR || rc == NGX_AGAIN) {
149+
return rc;
150+
}
151+
152+
return NGX_DECLINED;
148153
}
149154

150155
return NGX_OK;
@@ -272,10 +277,6 @@ ngx_http_lua_header_filter(ngx_http_request_t *r)
272277

273278
ctx->context = old_context;
274279

275-
if (r->filter_finalize) {
276-
return rc;
277-
}
278-
279280
if (rc == NGX_DECLINED) {
280281
return NGX_OK;
281282
}

0 commit comments

Comments
 (0)