Mercurial > hg > nginx
diff 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 |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -195,9 +195,14 @@ char *ngx_conf_check_num_bounds(ngx_conf conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev; \ } +#define ngx_conf_merge_sec_value(conf, prev, default) \ + if (conf == NGX_CONF_UNSET) { \ + conf = (prev == NGX_CONF_UNSET) ? default : prev; \ + } + #define ngx_conf_merge_size_value(conf, prev, default) \ - if (conf == (ssize_t) NGX_CONF_UNSET) { \ - conf = (prev == (ssize_t) NGX_CONF_UNSET) ? default : prev; \ + if (conf == (ssize_t) NGX_CONF_UNSET) { \ + conf = (prev == (ssize_t) NGX_CONF_UNSET) ? default : prev; \ } #define ngx_conf_merge_str_value(conf, prev, default) \ @@ -244,6 +249,7 @@ char *ngx_conf_set_str_slot(ngx_conf_t * char *ngx_conf_set_num_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); +char *ngx_conf_set_sec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_time_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_bufs_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);