Mercurial > hg > nginx
comparison src/mail/ngx_mail_core_module.c @ 6141:bf1655ae9a1c
Removed the deprecated "so_keepalive" directive.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 29 Apr 2015 13:53:08 +0300 |
parents | fc99323a3d79 |
children | f61049c80458 |
comparison
equal
deleted
inserted
replaced
6140:2911b7e5491b | 6141:bf1655ae9a1c |
---|---|
25 void *conf); | 25 void *conf); |
26 static char *ngx_mail_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, | 26 static char *ngx_mail_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, |
27 void *conf); | 27 void *conf); |
28 | 28 |
29 | 29 |
30 static ngx_conf_deprecated_t ngx_conf_deprecated_so_keepalive = { | |
31 ngx_conf_deprecated, "so_keepalive", | |
32 "so_keepalive\" parameter of the \"listen" | |
33 }; | |
34 | |
35 | |
36 static ngx_command_t ngx_mail_core_commands[] = { | 30 static ngx_command_t ngx_mail_core_commands[] = { |
37 | 31 |
38 { ngx_string("server"), | 32 { ngx_string("server"), |
39 NGX_MAIL_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS, | 33 NGX_MAIL_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS, |
40 ngx_mail_core_server, | 34 ngx_mail_core_server, |
53 NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, | 47 NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
54 ngx_mail_core_protocol, | 48 ngx_mail_core_protocol, |
55 NGX_MAIL_SRV_CONF_OFFSET, | 49 NGX_MAIL_SRV_CONF_OFFSET, |
56 0, | 50 0, |
57 NULL }, | 51 NULL }, |
58 | |
59 { ngx_string("so_keepalive"), | |
60 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, | |
61 ngx_conf_set_flag_slot, | |
62 NGX_MAIL_SRV_CONF_OFFSET, | |
63 offsetof(ngx_mail_core_srv_conf_t, so_keepalive), | |
64 &ngx_conf_deprecated_so_keepalive }, | |
65 | 52 |
66 { ngx_string("timeout"), | 53 { ngx_string("timeout"), |
67 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, | 54 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
68 ngx_conf_set_msec_slot, | 55 ngx_conf_set_msec_slot, |
69 NGX_MAIL_SRV_CONF_OFFSET, | 56 NGX_MAIL_SRV_CONF_OFFSET, |
173 * cscf->error_log = NULL; | 160 * cscf->error_log = NULL; |
174 */ | 161 */ |
175 | 162 |
176 cscf->timeout = NGX_CONF_UNSET_MSEC; | 163 cscf->timeout = NGX_CONF_UNSET_MSEC; |
177 cscf->resolver_timeout = NGX_CONF_UNSET_MSEC; | 164 cscf->resolver_timeout = NGX_CONF_UNSET_MSEC; |
178 cscf->so_keepalive = NGX_CONF_UNSET; | |
179 | 165 |
180 cscf->resolver = NGX_CONF_UNSET_PTR; | 166 cscf->resolver = NGX_CONF_UNSET_PTR; |
181 | 167 |
182 cscf->file_name = cf->conf_file->file.name.data; | 168 cscf->file_name = cf->conf_file->file.name.data; |
183 cscf->line = cf->conf_file->line; | 169 cscf->line = cf->conf_file->line; |
193 ngx_mail_core_srv_conf_t *conf = child; | 179 ngx_mail_core_srv_conf_t *conf = child; |
194 | 180 |
195 ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000); | 181 ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000); |
196 ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout, | 182 ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout, |
197 30000); | 183 30000); |
198 | |
199 ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0); | |
200 | 184 |
201 | 185 |
202 ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); | 186 ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); |
203 | 187 |
204 if (conf->server_name.len == 0) { | 188 if (conf->server_name.len == 0) { |