diff options
-rw-r--r-- | src/core/nginx.c | 4 | ||||
-rw-r--r-- | src/core/ngx_cycle.h | 2 | ||||
-rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 26ed69eab..47dafe141 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -109,7 +109,7 @@ static ngx_command_t ngx_core_commands[] = { { ngx_string("worker_rlimit_core"), NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, + ngx_conf_set_size_slot, 0, offsetof(ngx_core_conf_t, rlimit_core), NULL }, @@ -620,7 +620,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle) ccf->debug_points = NGX_CONF_UNSET; ccf->rlimit_nofile = NGX_CONF_UNSET; - ccf->rlimit_core = NGX_CONF_UNSET; + ccf->rlimit_core = NGX_CONF_UNSET_SIZE; ccf->rlimit_sigpending = NGX_CONF_UNSET; ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index e1a35eb75..677132ee1 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -68,8 +68,8 @@ typedef struct { ngx_int_t debug_points; ngx_int_t rlimit_nofile; - ngx_int_t rlimit_core; ngx_int_t rlimit_sigpending; + size_t rlimit_core; int priority; diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index a262ba5eb..da4828f88 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -787,7 +787,7 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority) } } - if (ccf->rlimit_core != NGX_CONF_UNSET) { + if (ccf->rlimit_core != NGX_CONF_UNSET_SIZE) { rlmt.rlim_cur = (rlim_t) ccf->rlimit_core; rlmt.rlim_max = (rlim_t) ccf->rlimit_core; |