lighttpd
/
lighttpd2
2
0
Fork 0
Code Issues Wiki

[config parser] fix detection of conflicts between options and uservars

This commit is contained in:
Thomas Porzelt 2011-08-28 14:17:47 +02:00
parent 3ef949bbb9
commit 2ebf367df5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/config_parser.rl
View File

@ -791,6 +791,13 @@ static gboolean config_parser_include(liServer *srv, GList *ctx_stack, gchar *pa
return FALSE;
}
if (NULL != g_hash_table_lookup(srv->options, name->data.string->str)) {
WARNING(srv, "cannot define uservar with name '%s', an option with same name exists already", name->data.string->str);
li_value_free(name);
li_value_free(v);
return FALSE;
}
if (NULL != g_hash_table_lookup(srv->optionptrs, name->data.string->str)) {
WARNING(srv, "cannot define uservar with name '%s', an option with same name exists already", name->data.string->str);
li_value_free(name);