Mercurial > hg > nginx

comparison src/core/nginx.c @ 6127:967594ba7571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 537259db5af4
children 1b7e246e6b38
comparison
equal deleted inserted replaced
6126:adba26ff70b5 6127:967594ba7571
114 { ngx_string("worker_rlimit_core"), 114 { ngx_string("worker_rlimit_core"),
115 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, 115 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
116 ngx_conf_set_off_slot, 116 ngx_conf_set_off_slot,
117 0, 117 0,
118 offsetof(ngx_core_conf_t, rlimit_core), 118 offsetof(ngx_core_conf_t, rlimit_core),
119 NULL },
120
121 { ngx_string("worker_rlimit_sigpending"),
122 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
123 ngx_conf_set_num_slot,
124 0,
125 offsetof(ngx_core_conf_t, rlimit_sigpending),
126 NULL }, 119 NULL },
127 120
128 { ngx_string("working_directory"), 121 { ngx_string("working_directory"),
129 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, 122 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
130 ngx_conf_set_str_slot, 123 ngx_conf_set_str_slot,
946 ccf->worker_processes = NGX_CONF_UNSET; 939 ccf->worker_processes = NGX_CONF_UNSET;
947 ccf->debug_points = NGX_CONF_UNSET; 940 ccf->debug_points = NGX_CONF_UNSET;
948 941
949 ccf->rlimit_nofile = NGX_CONF_UNSET; 942 ccf->rlimit_nofile = NGX_CONF_UNSET;
950 ccf->rlimit_core = NGX_CONF_UNSET; 943 ccf->rlimit_core = NGX_CONF_UNSET;
951 ccf->rlimit_sigpending = NGX_CONF_UNSET;
952 944
953 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; 945 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;
954 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; 946 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT;
955 947
956 if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t)) 948 if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t))