diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-04-23 14:26:11 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-04-23 14:26:11 +0300 |
| commit | 3180f84b609c0ef1117a25f1752556b57d277ffd (patch) | |
| tree | 6cdf1c79cda861c327a404e67801b596cf991a84 /src | |
| parent | 33b8e5bc0698c96177a69aa783375aa47ac980d1 (diff) | |
| download | nginx-3180f84b609c0ef1117a25f1752556b57d277ffd.tar.gz nginx-3180f84b609c0ef1117a25f1752556b57d277ffd.zip | |
Removed the "worker_rlimit_sigpending" directive.
It was only needed by the just removed rtsig module.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/nginx.c | 8 | ||||
| -rw-r--r-- | src/core/ngx_cycle.h | 1 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 13 |
3 files changed, 0 insertions, 22 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 90c60fd0a..231a3daf5 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -118,13 +118,6 @@ static ngx_command_t ngx_core_commands[] = { 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 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle) 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; diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index 0665bd023..c601ea133 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -83,7 +83,6 @@ typedef struct { ngx_int_t debug_points; ngx_int_t rlimit_nofile; - ngx_int_t rlimit_sigpending; off_t rlimit_core; int priority; diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 1d5e700a8..50676326f 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -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 (setgid(ccf->group) == -1) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, |