diff -r 450d2d5f4735 -r 360b9aabe17e src/server/daemon/configmanager.c --- a/src/server/daemon/configmanager.c Sat Oct 06 13:00:07 2012 +0200 +++ b/src/server/daemon/configmanager.c Sat Dec 15 16:05:03 2012 +0100 @@ -64,10 +64,11 @@ * ServerConfiguration and VirtualServer */ http_listener_ref(ls); - ls->cfg = cfg; + // TODO: this is non atomar sstr_t vsname = ls->default_vs.vs->name; ls->default_vs.vs = ucx_map_sstr_get(cfg->host_vs, vsname); + ls->cfg = cfg; return ls; }