diff -r 73aacbf6e492 -r d680536f8c2f src/server/daemon/httplistener.h
--- a/src/server/daemon/httplistener.h	Mon Jan 16 14:06:52 2012 +0100
+++ b/src/server/daemon/httplistener.h	Sat Jan 21 16:37:35 2012 +0100
@@ -35,12 +35,18 @@
 extern "C" {
 #endif
 
-typedef struct _http_listener    HttpListener;
+/* HttpListener typedef in nsapi.h */
 typedef struct _acceptor         Acceptor;
 typedef struct _listener_config  ListenerConfig;
 
+
+union vs {
+    VirtualServer    *vs;
+    char             *vs_name;
+};
 struct _listener_config {
-    char           *name;
+    sstr_t         name;
+    sstr_t         vs;
     char           *address;
     int            port;
     int            nacceptors;
@@ -52,6 +58,9 @@
 };
 
 struct _http_listener {
+    sstr_t           name;
+    union vs         default_vs;
+    int              port;
     int              server_socket;
     Acceptor         **acceptors;
     int              nacceptors;
@@ -59,14 +68,11 @@
 };
 
 int start_all_listener();
-HttpListener* get_http_listener(char *name);
-
 
 HttpListener* http_listener_new(ListenerConfig *conf);
 
 int http_listener_start(HttpListener *listener);
 
-
 Acceptor* acceptor_new(HttpListener *listener);
 
 void acceptor_start(Acceptor *a);