From 89cbb82286ec5188335ca8140901726c92de8960 Mon Sep 17 00:00:00 2001 From: mOo Date: Thu, 29 Sep 2005 17:09:12 +0000 Subject: [PATCH] check all block for unknown config-key instead of only global one git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@761 152afb58-edef-0310-8abb-c4023f1b3aa9 --- src/server.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/server.c b/src/server.c index 1bba79f0..94416c7a 100644 --- a/src/server.c +++ b/src/server.c @@ -684,19 +684,24 @@ int main (int argc, char **argv) { } /* dump unused config-keys */ - for (i = 0; srv->config && i < srv->config->used; i++) { - data_unset *du = srv->config->data[i]; - - /* all var.* is known as user defined variable */ - if (strncmp(du->key->ptr, "var.", sizeof("var.") - 1) == 0) { - continue; - } + for (i = 0; i < srv->config_context->used; i++) { + array *config = ((data_config *)srv->config_context->data[i])->value; + size_t j; + + for (j = 0; config && j < config->used; j++) { + data_unset *du = config->data[j]; + + /* all var.* is known as user defined variable */ + if (strncmp(du->key->ptr, "var.", sizeof("var.") - 1) == 0) { + continue; + } - if (NULL == array_get_element(srv->config_touched, du->key->ptr)) { - log_error_write(srv, __FILE__, __LINE__, "sbs", - "WARNING: unknown config-key:", - du->key, - "(ignored)"); + if (NULL == array_get_element(srv->config_touched, du->key->ptr)) { + log_error_write(srv, __FILE__, __LINE__, "sbs", + "WARNING: unknown config-key:", + du->key, + "(ignored)"); + } } }