diff -r feb2f1e115c6 -r c858850f3d3a src/server/daemon/config.h --- a/src/server/daemon/config.h Mon May 06 14:54:40 2013 +0200 +++ b/src/server/daemon/config.h Thu May 09 13:19:51 2013 +0200 @@ -51,15 +51,15 @@ extern "C" { #endif - +typedef struct mime_map MimeMap; + typedef struct _server_configuration { pool_handle_t *pool; UcxMap *host_vs; // map of all vservers. key is the host name UcxList *listeners; // list of all listeners UcxList *logfiles; UcxMap *authdbs; - UcxMap *mimetypes; - ACLData *acls; + MimeMap *mimetypes; sstr_t tmp; sstr_t user; uint32_t ref; // reference counter @@ -77,6 +77,10 @@ void *data; }; +struct mime_map { + UcxMap *map; + uint32_t ref; +}; int load_init_conf(char *file); @@ -104,8 +108,12 @@ int object_conf_reload(ConfigFile *file, ServerConfiguration *cfg); +void object_conf_ref(HTTPObjectConfig *conf); +void object_conf_unref(HTTPObjectConfig *conf); HTTPObjectConfig* load_obj_conf(char *file); int mime_conf_reload(ConfigFile *file, ServerConfiguration *cfg); +void mime_conf_ref(MimeMap *conf); +void mime_conf_unref(MimeMap *conf); int acl_conf_reload(ConfigFile *file, ServerConfiguration *cfg); ACLList* acl_config_convert(ServerConfiguration *cfg, ACLConfig *acl);