Mercurial > hg > nginx
changeset 6127:967594ba7571
Removed the "worker_rlimit_sigpending" directive.
It was only needed by the just removed rtsig module.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 23 Apr 2015 14:26:11 +0300 |
parents | adba26ff70b5 |
children | 69ad3e77922b |
files | src/core/nginx.c src/core/ngx_cycle.h src/os/unix/ngx_process_cycle.c |
diffstat | 3 files changed, 0 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/nginx.c Thu Apr 23 14:17:40 2015 +0300 +++ b/src/core/nginx.c Thu Apr 23 14:26:11 2015 +0300 @@ -118,13 +118,6 @@ offsetof(ngx_core_conf_t, rlimit_core), NULL }, - { ngx_string("worker_rlimit_sigpending"), - NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, - 0, - offsetof(ngx_core_conf_t, rlimit_sigpending), - NULL }, - { ngx_string("working_directory"), NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, ngx_conf_set_str_slot, @@ -948,7 +941,6 @@ ccf->rlimit_nofile = NGX_CONF_UNSET; ccf->rlimit_core = NGX_CONF_UNSET; - ccf->rlimit_sigpending = NGX_CONF_UNSET; ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT;
--- a/src/core/ngx_cycle.h Thu Apr 23 14:17:40 2015 +0300 +++ b/src/core/ngx_cycle.h Thu Apr 23 14:26:11 2015 +0300 @@ -83,7 +83,6 @@ ngx_int_t debug_points; ngx_int_t rlimit_nofile; - ngx_int_t rlimit_sigpending; off_t rlimit_core; int priority;
--- a/src/os/unix/ngx_process_cycle.c Thu Apr 23 14:17:40 2015 +0300 +++ b/src/os/unix/ngx_process_cycle.c Thu Apr 23 14:26:11 2015 +0300 @@ -840,19 +840,6 @@ } } -#ifdef RLIMIT_SIGPENDING - if (ccf->rlimit_sigpending != NGX_CONF_UNSET) { - rlmt.rlim_cur = (rlim_t) ccf->rlimit_sigpending; - rlmt.rlim_max = (rlim_t) ccf->rlimit_sigpending; - - if (setrlimit(RLIMIT_SIGPENDING, &rlmt) == -1) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - "setrlimit(RLIMIT_SIGPENDING, %i) failed", - ccf->rlimit_sigpending); - } - } -#endif - if (geteuid() == 0) { if (setgid(ccf->group) == -1) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,