diff -r bdec069d2239 -r 73b3485e96f1 src/server/daemon/config.c --- a/src/server/daemon/config.c Thu Jul 11 14:21:23 2013 +0200 +++ b/src/server/daemon/config.c Tue Jul 16 12:14:13 2013 +0200 @@ -256,7 +256,7 @@ //int b = 0; UcxMapIterator iter = ucx_map_iterator(serverconfig->host_vs); VirtualServer *vs; - UCX_MAP_FOREACH(vs, iter) { + UCX_MAP_FOREACH(key, vs, iter) { if(!sstrcmp(vsname, vs->name)) { listener->default_vs.vs = vs; break; @@ -316,6 +316,7 @@ f->data = NULL; f->file = sstrdup(file); f->reload = mime_conf_reload; + f->last_modified = 0; // load the file content //f->reload(f, cfg); @@ -535,6 +536,7 @@ f->data = NULL; f->file = sstrdup(file); f->reload = keyfile_reload; + f->last_modified = 0; //f->reload(f, cfg); if(cfgmgr_reload_file(f, cfg, NULL)) { free(f->file.ptr); @@ -617,6 +619,7 @@ f->data = NULL; f->file = sstrdup(file); f->reload = object_conf_reload; + f->last_modified = 0; //f->reload(f, cfg); if(cfgmgr_reload_file(f, cfg, NULL)) { free(f->file.ptr); @@ -640,6 +643,7 @@ aclf->data = NULL; aclf->file = sstrdup(file); aclf->reload = acl_conf_reload; + aclf->last_modified = 0; //aclf->reload(aclf, cfg); if(cfgmgr_reload_file(aclf, cfg, NULL)) { free(aclf->file.ptr); @@ -820,7 +824,7 @@ printf("free MimeConfig %"PRIxPTR"\n", (intptr_t)conf); UcxMapIterator i = ucx_map_iterator(conf->map); char *str; - UCX_MAP_FOREACH(str, i) { + UCX_MAP_FOREACH(key, str, i) { free(str); } ucx_map_free(conf->map);