Mercurial > hg > nginx
comparison src/core/ngx_conf_file.h @ 172:caa57ddf6d77
nginx-0.0.1-2003-11-04-01:20:44 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 03 Nov 2003 22:20:44 +0000 |
parents | c42be4185301 |
children | c0552e5ab567 |
comparison
equal
deleted
inserted
replaced
171:aff0e5d32af8 | 172:caa57ddf6d77 |
---|---|
193 #define ngx_conf_merge_msec_value(conf, prev, default) \ | 193 #define ngx_conf_merge_msec_value(conf, prev, default) \ |
194 if (conf == (ngx_msec_t) NGX_CONF_UNSET) { \ | 194 if (conf == (ngx_msec_t) NGX_CONF_UNSET) { \ |
195 conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev; \ | 195 conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev; \ |
196 } | 196 } |
197 | 197 |
198 #define ngx_conf_merge_sec_value(conf, prev, default) \ | |
199 if (conf == NGX_CONF_UNSET) { \ | |
200 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ | |
201 } | |
202 | |
198 #define ngx_conf_merge_size_value(conf, prev, default) \ | 203 #define ngx_conf_merge_size_value(conf, prev, default) \ |
199 if (conf == (ssize_t) NGX_CONF_UNSET) { \ | 204 if (conf == (ssize_t) NGX_CONF_UNSET) { \ |
200 conf = (prev == (ssize_t) NGX_CONF_UNSET) ? default : prev; \ | 205 conf = (prev == (ssize_t) NGX_CONF_UNSET) ? default : prev; \ |
201 } | 206 } |
202 | 207 |
203 #define ngx_conf_merge_str_value(conf, prev, default) \ | 208 #define ngx_conf_merge_str_value(conf, prev, default) \ |
204 if (conf.len == 0) { \ | 209 if (conf.len == 0) { \ |
205 if (prev.len) { \ | 210 if (prev.len) { \ |
242 char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 247 char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
243 char *ngx_conf_set_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 248 char *ngx_conf_set_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
244 char *ngx_conf_set_num_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 249 char *ngx_conf_set_num_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
245 char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 250 char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
246 char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 251 char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
252 char *ngx_conf_set_sec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | |
247 char *ngx_conf_set_time_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 253 char *ngx_conf_set_time_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
248 char *ngx_conf_set_bufs_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 254 char *ngx_conf_set_bufs_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
249 char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 255 char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
250 | 256 |
251 char *ngx_conf_set_core_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, | 257 char *ngx_conf_set_core_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, |