Mercurial > hg > nginx

comparison src/event/ngx_event.c @ 6139:b19350b896bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the deprecated "connections" directive.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 29 Apr 2015 13:52:37 +0300
parents be3aaf9f0005
children 4f6efabcb09b
comparison
equal deleted inserted replaced
6138:bc47a7a8159c 6139:b19350b896bb
124 ngx_event_connections, 124 ngx_event_connections,
125 0, 125 0,
126 0, 126 0,
127 NULL }, 127 NULL },
128 128
129 { ngx_string("connections"),
130 NGX_EVENT_CONF|NGX_CONF_TAKE1,
131 ngx_event_connections,
132 0,
133 0,
134 NULL },
135
136 { ngx_string("use"), 129 { ngx_string("use"),
137 NGX_EVENT_CONF|NGX_CONF_TAKE1, 130 NGX_EVENT_CONF|NGX_CONF_TAKE1,
138 ngx_event_use, 131 ngx_event_use,
139 0, 132 0,
140 0, 133 0,
954 947
955 if (ecf->connections != NGX_CONF_UNSET_UINT) { 948 if (ecf->connections != NGX_CONF_UNSET_UINT) {
956 return "is duplicate"; 949 return "is duplicate";
957 } 950 }
958 951
959 if (ngx_strcmp(cmd->name.data, "connections") == 0) {
960 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
961 "the \"connections\" directive is deprecated, "
962 "use the \"worker_connections\" directive instead");
963 }
964
965 value = cf->args->elts; 952 value = cf->args->elts;
966 ecf->connections = ngx_atoi(value[1].data, value[1].len); 953 ecf->connections = ngx_atoi(value[1].data, value[1].len);
967 if (ecf->connections == (ngx_uint_t) NGX_ERROR) { 954 if (ecf->connections == (ngx_uint_t) NGX_ERROR) {
968 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 955 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
969 "invalid number \"%V\"", &value[1]); 956 "invalid number \"%V\"", &value[1]);