mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-24 04:49:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

worker_rlimit_core should be off_t

Browse Source
This commit is contained in:
Igor Sysoev 2010-09-15 15:24:21 +00:00
parent 9a62648f7b
commit 8c70e67f7b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/nginx.c
View File

@ -110,7 +110,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_size_slot,
ngx_conf_set_off_slot,
0,
offsetof(ngx_core_conf_t, rlimit_core),
NULL },
@ -941,7 +941,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_SIZE;
ccf->rlimit_core = NGX_CONF_UNSET;
ccf->rlimit_sigpending = NGX_CONF_UNSET;
ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;

2
src/core/ngx_cycle.h
View File

@ -78,7 +78,7 @@ typedef struct {
ngx_int_t rlimit_nofile;
ngx_int_t rlimit_sigpending;
size_t rlimit_core;
off_t rlimit_core;
int priority;

4
src/os/unix/ngx_process_cycle.c
View File

@ -856,13 +856,13 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority)
}
}
if (ccf->rlimit_core != NGX_CONF_UNSET_SIZE) {
if (ccf->rlimit_core != NGX_CONF_UNSET) {
rlmt.rlim_cur = (rlim_t) ccf->rlimit_core;
rlmt.rlim_max = (rlim_t) ccf->rlimit_core;
if (setrlimit(RLIMIT_CORE, &rlmt) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"setrlimit(RLIMIT_CORE, %i) failed",
"setrlimit(RLIMIT_CORE, %O) failed",
ccf->rlimit_core);
}
}