diff -r 5f7660fe1562 -r f1cff81e425a src/server/daemon/configmanager.c --- a/src/server/daemon/configmanager.c Mon Jun 24 14:41:32 2013 +0200 +++ b/src/server/daemon/configmanager.c Tue Jun 25 15:45:13 2013 +0200 @@ -63,37 +63,6 @@ return ucx_map_sstr_get(config_files, name); } -// copy functions -static void* copy_listener(HttpListener *ls, ServerConfiguration *cfg) { - /* - * we reuse the old listener, but change the - * ServerConfiguration and VirtualServer - */ - http_listener_ref(ls); - - // 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; -} - -static void* copy_vs(void *vserver, void *pool) { - VirtualServer *vs = vs_copy(vserver, pool); - - /* - * this function is executed on configuration reload, so some - * VS configs may be changed - * - * vs - * objects - */ - ConfigFile *objectfile = cfgmgr_get_file(vs->objectfile); - vs->objects = objectfile->data; - return vs; -} - int cfgmgr_reload_file(ConfigFile *f, ServerConfiguration *conf, int *reload) { struct stat s; if(stat(f->file.ptr, &s) != 0) { @@ -152,41 +121,6 @@ } sc_last_modified = s.st_mtime; - } else if(0) { - /* copy configuration */ - printf("cfgmgr copy server.conf\n"); - - /* TODO: copy */ - /* - config = load_server_conf( - current_config, - "config/server.conf"); - */ - config = malloc(sizeof(ServerConfiguration)); - config->ref = 1; - config->pool = pool_create(); - config->user = sstrdup_pool(config->pool, current_config->user); - config->tmp = sstrdup_pool(config->pool, current_config->tmp); - - // copy configuration - config->host_vs = ucx_map_clone( - current_config->host_vs, - copy_vs, - config->pool); - - config->listeners = ucx_list_clone( - current_config->listeners, - (copy_func)copy_listener, - config); - - // TODO: we need to get the mime map from the configfile data - config->mimetypes = current_config->mimetypes; - - if(config == NULL) { - fprintf(stderr, "Cannot load server.conf\n"); - return -1; - } - } else { printf("no reconfig required!\n"); config = current_config;