comparison src/core/nginx.c @ 598:be70f83b184f NGINX_0_8_51

nginx 0.8.51 *) Change: the "secure_link_expires" directive has been canceled. *) Change: a logging level of resolver errors has been lowered from "alert" to "error". *) Feature: now a listen socket "ssl" parameter may be set several times.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Sep 2010 00:00:00 +0400
parents 6c96fdd2dfc3
children 428c6e58046a
comparison
equal deleted inserted replaced
597:1695031dbfed 598:be70f83b184f
108 offsetof(ngx_core_conf_t, rlimit_nofile), 108 offsetof(ngx_core_conf_t, rlimit_nofile),
109 NULL }, 109 NULL },
110 110
111 { ngx_string("worker_rlimit_core"), 111 { ngx_string("worker_rlimit_core"),
112 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, 112 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
113 ngx_conf_set_size_slot, 113 ngx_conf_set_off_slot,
114 0, 114 0,
115 offsetof(ngx_core_conf_t, rlimit_core), 115 offsetof(ngx_core_conf_t, rlimit_core),
116 NULL }, 116 NULL },
117 117
118 { ngx_string("worker_rlimit_sigpending"), 118 { ngx_string("worker_rlimit_sigpending"),
939 939
940 ccf->worker_processes = NGX_CONF_UNSET; 940 ccf->worker_processes = NGX_CONF_UNSET;
941 ccf->debug_points = NGX_CONF_UNSET; 941 ccf->debug_points = NGX_CONF_UNSET;
942 942
943 ccf->rlimit_nofile = NGX_CONF_UNSET; 943 ccf->rlimit_nofile = NGX_CONF_UNSET;
944 ccf->rlimit_core = NGX_CONF_UNSET_SIZE; 944 ccf->rlimit_core = NGX_CONF_UNSET;
945 ccf->rlimit_sigpending = NGX_CONF_UNSET; 945 ccf->rlimit_sigpending = NGX_CONF_UNSET;
946 946
947 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; 947 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;
948 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; 948 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT;
949 949