comparison: src/server/daemon/config.c
src/server/daemon/config.c
- changeset 629
- 1e1da9adc532
- parent 625
- a1e8a35c677a
- child 635
- b85d45fd3b01
equal
deleted
inserted
replaced
| 628:c95f04c14112 | 629:1e1da9adc532 |
|---|---|
| 1045 } | 1045 } |
| 1046 | 1046 |
| 1047 return 0; | 1047 return 0; |
| 1048 } | 1048 } |
| 1049 | 1049 |
| 1050 static int convert_objconf(ServerConfiguration *scfg, ObjectConfig2 *cfg, HTTPObjectConfig *conf, cxmutstr file) { | 1050 static int convert_objconf(ServerConfiguration *scfg, ObjectConfig *cfg, HTTPObjectConfig *conf, cxmutstr file) { |
| 1051 pool_handle_t *pool = conf->pool; | 1051 pool_handle_t *pool = conf->pool; |
| 1052 | 1052 |
| 1053 int condition_index = 0; | 1053 int condition_index = 0; |
| 1054 | 1054 |
| 1055 int i = 0; | 1055 int i = 0; |
| 1114 return NULL; | 1114 return NULL; |
| 1115 } | 1115 } |
| 1116 conf->pool = pool; | 1116 conf->pool = pool; |
| 1117 | 1117 |
| 1118 // load obj config file | 1118 // load obj config file |
| 1119 ObjectConfig2 *cfg = objectconf_load(file.ptr); | 1119 ObjectConfig *cfg = objectconf_load(file.ptr); |
| 1120 if(!cfg) { | 1120 if(!cfg) { |
| 1121 return NULL; | 1121 return NULL; |
| 1122 } | 1122 } |
| 1123 | 1123 |
| 1124 // convert ObjectConfig to HTTPObjectConfig | 1124 // convert ObjectConfig to HTTPObjectConfig |
