Mercurial > hg > webserver / file diff

--- a/src/server/conf.c	Mon Dec 26 15:48:32 2011 +0100
+++ b/src/server/conf.c	Tue Dec 27 20:12:21 2011 +0100
@@ -56,7 +56,7 @@
     printf("load_server_conf\n");
     
     ListenerConfig *conf = malloc(sizeof(ListenerConfig));
-    conf->port = 8080;
+    conf->port = 9090;
     conf->nacceptors = 1;
     conf->name = "default";
 
@@ -64,7 +64,8 @@
 
     // virtual server
     default_vs = vs_new();
-    default_vs->objset = create_test_objset();
+    // load obj.conf
+    default_vs->objects = load_obj_conf("conf/obj.conf");
     default_vs->default_obj_name = "default";
 
     // begin objset test