comparison: src/server/daemon/config.h
src/server/daemon/config.h
- changeset 388
- 30d29ef5b79a
- parent 373
- f78a585e1a2f
- child 415
- d938228c382e
equal
deleted
inserted
replaced
| 387:f5caf41b4db6 | 388:30d29ef5b79a |
|---|---|
| 59 typedef struct mime_map MimeMap; | 59 typedef struct mime_map MimeMap; |
| 60 | 60 |
| 61 typedef struct WebdavRepository WebdavRepository; | 61 typedef struct WebdavRepository WebdavRepository; |
| 62 typedef struct WebdavBackendInitData WebdavBackendInitData; | 62 typedef struct WebdavBackendInitData WebdavBackendInitData; |
| 63 | 63 |
| 64 typedef struct CfgManager { | |
| 65 ServerConfig *serverconf; | |
| 66 ServerConfiguration *cfg; | |
| 67 } CfgManager; | |
| 68 | |
| 64 struct ServerConfiguration { | 69 struct ServerConfiguration { |
| 65 pool_handle_t *pool; | 70 pool_handle_t *pool; |
| 66 UcxAllocator *a; | 71 UcxAllocator *a; |
| 67 | 72 |
| 68 UcxMap *host_vs; // map of all vservers. key is the host name | 73 UcxMap *host_vs; // map of all vservers. key is the host name |
| 69 UcxList *listeners; // list of all listeners | 74 UcxList *listeners; // list of all listeners |
| 70 UcxList *logfiles; | 75 UcxList *logfiles; |
| 71 AccessLog *default_log; | 76 AccessLog *default_log; |
| 72 UcxMap *authdbs; | 77 UcxMap *authdbs; |
| 118 | 123 |
| 119 int cfg_handle_vs(ServerConfiguration *cfg, ConfigNode *obj); | 124 int cfg_handle_vs(ServerConfiguration *cfg, ConfigNode *obj); |
| 120 | 125 |
| 121 int cfg_handle_dav(ServerConfiguration *cfg, ConfigNode *obj); | 126 int cfg_handle_dav(ServerConfiguration *cfg, ConfigNode *obj); |
| 122 | 127 |
| 123 ServerConfiguration* load_server_conf(char *file); | 128 ServerConfiguration* load_server_conf(CfgManager *mgr, char *file); |
| 129 ServerConfiguration* apply_server_conf(CfgManager *mgr); | |
| 124 void cfg_ref(ServerConfiguration *cfg); | 130 void cfg_ref(ServerConfiguration *cfg); |
| 125 void cfg_unref(ServerConfiguration *cfg); | 131 void cfg_unref(ServerConfiguration *cfg); |
| 126 | 132 |
| 127 HTTPObjectConfig* objconf_load(ServerConfiguration *scfg, sstr_t file); | 133 HTTPObjectConfig* objconf_load(ServerConfiguration *scfg, sstr_t file); |
| 128 int mime_conf_load(ServerConfiguration *cfg, sstr_t file); | 134 int mime_conf_load(ServerConfiguration *cfg, sstr_t file); |
