Skip to content

Fix recursive script no-cacheable flushing #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xintenseapple wants to merge 1 commit into
base: default
Choose a base branch
from
Open

Fix recursive script no-cacheable flushing #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/http/ngx_http_request.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ struct ngx_http_request_s {
ngx_uint_t access_code;

ngx_http_variable_value_t *variables;
/* suppress recursive no-cacheable flushes during script evaluation */
ngx_uint_t script_depth;

#if (NGX_PCRE)
ngx_uint_t ncaptures;
Expand Down
64 changes: 53 additions & 11 deletions src/http/ngx_http_script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ ngx_http_complex_value(ngx_http_request_t *r, ngx_http_complex_value_t *val,
ngx_str_t *value)
{
size_t len;
ngx_uint_t flushed;
ngx_http_script_code_pt code;
ngx_http_script_len_code_pt lcode;
ngx_http_script_engine_t e;
Expand All @@ -67,7 +68,13 @@ ngx_http_complex_value(ngx_http_request_t *r, ngx_http_complex_value_t *val,
return NGX_OK;
}

ngx_http_script_flush_complex_value(r, val);
flushed = (r->script_depth == 0);

if (flushed) {
ngx_http_script_flush_complex_value(r, val);
}

r->script_depth++;

ngx_memzero(&e, sizeof(ngx_http_script_engine_t));

Expand All @@ -85,6 +92,7 @@ ngx_http_complex_value(ngx_http_request_t *r, ngx_http_complex_value_t *val,
value->len = len;
value->data = ngx_pnalloc(r->pool, len);
if (value->data == NULL) {
r->script_depth--;
return NGX_ERROR;
}

Expand All @@ -99,6 +107,8 @@ ngx_http_complex_value(ngx_http_request_t *r, ngx_http_complex_value_t *val,

*value = e.buf;

r->script_depth--;

return NGX_OK;
}

Expand Down Expand Up @@ -607,20 +617,27 @@ ngx_http_script_run(ngx_http_request_t *r, ngx_str_t *value,
void *code_lengths, size_t len, void *code_values)
{
ngx_uint_t i;
ngx_uint_t flushed;
ngx_http_script_code_pt code;
ngx_http_script_len_code_pt lcode;
ngx_http_script_engine_t e;
ngx_http_core_main_conf_t *cmcf;

cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
flushed = (r->script_depth == 0);

if (flushed) {
cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

for (i = 0; i < cmcf->variables.nelts; i++) {
if (r->variables[i].no_cacheable) {
r->variables[i].valid = 0;
r->variables[i].not_found = 0;
for (i = 0; i < cmcf->variables.nelts; i++) {
if (r->variables[i].no_cacheable) {
r->variables[i].valid = 0;
r->variables[i].not_found = 0;
}
}
}

r->script_depth++;

ngx_memzero(&e, sizeof(ngx_http_script_engine_t));

e.ip = code_lengths;
Expand All @@ -636,6 +653,7 @@ ngx_http_script_run(ngx_http_request_t *r, ngx_str_t *value,
value->len = len;
value->data = ngx_pnalloc(r->pool, len);
if (value->data == NULL) {
r->script_depth--;
return NULL;
}

Expand All @@ -647,6 +665,8 @@ ngx_http_script_run(ngx_http_request_t *r, ngx_str_t *value,
code((ngx_http_script_engine_t *) &e);
}

r->script_depth--;

return e.pos;
}

Expand All @@ -657,6 +677,10 @@ ngx_http_script_flush_no_cacheable_variables(ngx_http_request_t *r,
{
ngx_uint_t n, *index;

if (r->script_depth) {
return;
}

if (indices) {
index = indices->elts;
for (n = 0; n < indices->nelts; n++) {
Expand Down Expand Up @@ -922,20 +946,26 @@ ngx_http_script_add_var_code(ngx_http_script_compile_t *sc, ngx_str_t *name)
size_t
ngx_http_script_copy_var_len_code(ngx_http_script_engine_t *e)
{
ngx_http_request_t *r;
ngx_http_variable_value_t *value;
ngx_http_script_var_code_t *code;

code = (ngx_http_script_var_code_t *) e->ip;

e->ip += sizeof(ngx_http_script_var_code_t);

r = e->request;
r->script_depth++;

if (e->flushed) {
value = ngx_http_get_indexed_variable(e->request, code->index);
value = ngx_http_get_indexed_variable(r, code->index);

} else {
value = ngx_http_get_flushed_variable(e->request, code->index);
value = ngx_http_get_flushed_variable(r, code->index);
}

r->script_depth--;

if (value && !value->not_found) {
return value->len;
}
Expand All @@ -948,6 +978,7 @@ void
ngx_http_script_copy_var_code(ngx_http_script_engine_t *e)
{
u_char *p;
ngx_http_request_t *r;
ngx_http_variable_value_t *value;
ngx_http_script_var_code_t *code;

Expand All @@ -957,13 +988,18 @@ ngx_http_script_copy_var_code(ngx_http_script_engine_t *e)

if (!e->skip) {

r = e->request;
r->script_depth++;

if (e->flushed) {
value = ngx_http_get_indexed_variable(e->request, code->index);
value = ngx_http_get_indexed_variable(r, code->index);

} else {
value = ngx_http_get_flushed_variable(e->request, code->index);
value = ngx_http_get_flushed_variable(r, code->index);
}

r->script_depth--;

if (value && !value->not_found) {
p = e->pos;
e->pos = ngx_copy(p, value->data, value->len);
Expand Down Expand Up @@ -1824,6 +1860,7 @@ ngx_http_script_var_set_handler_code(ngx_http_script_engine_t *e)
void
ngx_http_script_var_code(ngx_http_script_engine_t *e)
{
ngx_http_request_t *r;
ngx_http_variable_value_t *value;
ngx_http_script_var_code_t *code;

Expand All @@ -1834,7 +1871,12 @@ ngx_http_script_var_code(ngx_http_script_engine_t *e)

e->ip += sizeof(ngx_http_script_var_code_t);

value = ngx_http_get_flushed_variable(e->request, code->index);
r = e->request;
r->script_depth++;

value = ngx_http_get_flushed_variable(r, code->index);

r->script_depth--;

if (value && !value->not_found) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0,
Expand Down