details: http://hg.nginx.org/nginx/rev/967594ba7571
branches:
changeset: 6127:967594ba7571
user: Ruslan Ermilov <ru@nginx.com>
date: Thu Apr 23 14:26:11 2015 +0300
description:
Removed the "worker_rlimit_sigpending" directive.

It was only needed by the just removed rtsig module.

diffstat:

src/core/nginx.c | 8 --------
src/core/ngx_cycle.h | 1 -
src/os/unix/ngx_process_cycle.c | 13 -------------
3 files changed, 0 insertions(+), 22 deletions(-)

diffs (59 lines):

diff -r adba26ff70b5 -r 967594ba7571 src/core/nginx.c
--- 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 @@ 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

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 -r adba26ff70b5 -r 967594ba7571 src/core/ngx_cycle.h
--- 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 @@ typedef struct {
ngx_int_t debug_points;

ngx_int_t rlimit_nofile;
- ngx_int_t rlimit_sigpending;
off_t rlimit_core;

int priority;
diff -r adba26ff70b5 -r 967594ba7571 src/os/unix/ngx_process_cycle.c
--- 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 @@ ngx_worker_process_init(ngx_cycle_t *cyc
}
}

-#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,

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel