summaryrefslogtreecommitdiff
path: root/src/configparser.y
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2016-02-21 18:32:14 +0000
committerStefan Bühler <stbuehler@web.de>2016-02-21 18:32:14 +0000
commitad65603ec07499e5eb4e5b8b7b09d5d3937f1396 (patch)
treedfb6a51f7c72ce4dfee3604768e0564f8cd5bf39 /src/configparser.y
parent1c01a42aa3bf1ff997ae1e58e53b88053f84faa8 (diff)
downloadlighttpd-git-ad65603ec07499e5eb4e5b8b7b09d5d3937f1396.tar.gz
[core] fix conditional cache handling
- add new "skip" result to mark conditions that didn't actually get evaluated to false but just skipped because the preconditions failed. - add "local_result" for each cache entry to remember whether the condition itself matched (not including the preconditions). this can be reused after a cache reset if the condition itself was not reset, but the preconditions were - clear result of subtree (children and else-branches) when clearing a condition cache From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3082 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'src/configparser.y')
-rw-r--r--src/configparser.y2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/configparser.y b/src/configparser.y
index 7f33f05a..b22dac1e 100644
--- a/src/configparser.y
+++ b/src/configparser.y
@@ -17,7 +17,7 @@ static void configparser_push(config_t *ctx, data_config *dc, int isnew) {
force_assert(dc->context_ndx > ctx->current->context_ndx);
array_insert_unique(ctx->all_configs, (data_unset *)dc);
dc->parent = ctx->current;
- array_insert_unique(dc->parent->childs, (data_unset *)dc);
+ array_insert_unique(dc->parent->children, (data_unset *)dc);
}
if (ctx->configs_stack->used > 0 && ctx->current->context_ndx == 0) {
fprintf(stderr, "Cannot use conditionals inside a global { ... } block\n");