diff -r 069c152f6272 -r 5bc6d078fb2c src/server/daemon/config.c --- a/src/server/daemon/config.c Fri Jun 21 12:10:44 2013 +0200 +++ b/src/server/daemon/config.c Sun Jun 23 13:49:17 2013 +0200 @@ -656,14 +656,14 @@ return NULL; } - /* create object config */ + // create object config pool_handle_t *pool = pool_create(); HTTPObjectConfig *conf = pool_calloc(pool, sizeof(HTTPObjectConfig), 1); conf->pool = pool; - /* convert ObjectConfig to HTTPObjectConfig */ + // convert ObjectConfig to HTTPObjectConfig - /* add objects */ + // add objects conf->nobj = ucx_dlist_size(cfg->objects); conf->objects = pool_calloc(pool, 1, sizeof(httpd_object*)); @@ -672,7 +672,7 @@ while(objlist != NULL) { ConfigObject *cob = objlist->data; - /* get name and ppath */ + // get name and ppath char *name = NULL; char *ppath = NULL; if(cob->name.length > 0) { @@ -682,13 +682,13 @@ ppath = sstrdup_pool(pool, cob->ppath).ptr; } - /* create and add object */ + // create and add object httpd_object *obj = object_new(pool, name); obj->path = NULL; conf->objects[i] = obj; // TODO: beyond array bounds write - /* add directives */ + // add directives for(int i=0;i<6;i++) { UcxDlist *dirs = cob->directives[i]; while(dirs != NULL) { @@ -698,7 +698,7 @@ d->cond = NULL; d->param = pblock_create_pool(pool, 8); - /* add params */ + // add params UcxList *param = cfg_param_list(cfgdir->value, mp); while(param != NULL) { ConfigParam *p = param->data; @@ -711,18 +711,18 @@ param = param->next; } - /* get function */ + // get function char *func_name = pblock_findval("fn", d->param); d->func = get_function(func_name); dirs = dirs->next; - /* add function to dtable */ + // add function to dtable object_add_directive(obj, d, cfgdir->type_num); } } - /* next */ + // next i++; objlist = objlist->next; }