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

Removed the "worker_rlimit_sigpending" directive.

Browse Source 
It was only needed by the just removed rtsig module.
This commit is contained in:
Ruslan Ermilov 2015-04-23 14:26:11 +03:00
parent 33b8e5bc06
commit 3180f84b60
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/nginx.c
View File

@ -118,13 +118,6 @@ static ngx_command_t ngx_core_commands[] = {
offsetof(ngx_core_conf_t, rlimit_core), offsetof(ngx_core_conf_t, rlimit_core),
NULL }, 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_string("working_directory"),
NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot, ngx_conf_set_str_slot,
@ -948,7 +941,6 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
ccf->rlimit_nofile = NGX_CONF_UNSET; ccf->rlimit_nofile = NGX_CONF_UNSET;
ccf->rlimit_core = 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->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;
ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT;

1
src/core/ngx_cycle.h
View File

@ -83,7 +83,6 @@ typedef struct {
ngx_int_t debug_points; ngx_int_t debug_points;
ngx_int_t rlimit_nofile; ngx_int_t rlimit_nofile;
ngx_int_t rlimit_sigpending;
off_t rlimit_core; off_t rlimit_core;
int priority; int priority;

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

@ -840,19 +840,6 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
} }
} }
#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 (geteuid() == 0) {
if (setgid(ccf->group) == -1) { if (setgid(ccf->group) == -1) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,