Mercurial > hg > nginx

comparison src/mail/ngx_mail_core_module.c @ 1481:b58ce1cf66da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
smtp_client_buffer and smtp_greeting_delay
author Igor Sysoev <igor@sysoev.ru>
date Fri, 14 Sep 2007 13:58:49 +0000
parents c4b2c893989d
children f69493e8faab
comparison
equal deleted inserted replaced
1480:a231e37a19ab 1481:b58ce1cf66da
128 { ngx_string("imap_client_buffer"), 128 { ngx_string("imap_client_buffer"),
129 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, 129 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
130 ngx_conf_set_size_slot, 130 ngx_conf_set_size_slot,
131 NGX_MAIL_SRV_CONF_OFFSET, 131 NGX_MAIL_SRV_CONF_OFFSET,
132 offsetof(ngx_mail_core_srv_conf_t, imap_client_buffer_size), 132 offsetof(ngx_mail_core_srv_conf_t, imap_client_buffer_size),
133 NULL },
134
135 { ngx_string("smtp_client_buffer"),
136 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
137 ngx_conf_set_size_slot,
138 NGX_MAIL_SRV_CONF_OFFSET,
139 offsetof(ngx_mail_core_srv_conf_t, smtp_client_buffer_size),
140 NULL },
141
142 { ngx_string("smtp_greeting_delay"),
143 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
144 ngx_conf_set_msec_slot,
145 NGX_MAIL_SRV_CONF_OFFSET,
146 offsetof(ngx_mail_core_srv_conf_t, smtp_greeting_delay),
133 NULL }, 147 NULL },
134 148
135 { ngx_string("so_keepalive"), 149 { ngx_string("so_keepalive"),
136 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, 150 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
137 ngx_conf_set_flag_slot, 151 ngx_conf_set_flag_slot,
267 if (cscf == NULL) { 281 if (cscf == NULL) {
268 return NULL; 282 return NULL;
269 } 283 }
270 284
271 cscf->imap_client_buffer_size = NGX_CONF_UNSET_SIZE; 285 cscf->imap_client_buffer_size = NGX_CONF_UNSET_SIZE;
286 cscf->smtp_client_buffer_size = NGX_CONF_UNSET_SIZE;
272 cscf->protocol = NGX_CONF_UNSET_UINT; 287 cscf->protocol = NGX_CONF_UNSET_UINT;
273 cscf->timeout = NGX_CONF_UNSET_MSEC; 288 cscf->timeout = NGX_CONF_UNSET_MSEC;
289 cscf->smtp_greeting_delay = NGX_CONF_UNSET_MSEC;
274 cscf->so_keepalive = NGX_CONF_UNSET; 290 cscf->so_keepalive = NGX_CONF_UNSET;
275 291
276 if (ngx_array_init(&cscf->pop3_capabilities, cf->pool, 4, sizeof(ngx_str_t)) 292 if (ngx_array_init(&cscf->pop3_capabilities, cf->pool, 4, sizeof(ngx_str_t))
277 != NGX_OK) 293 != NGX_OK)
278 { 294 {
307 ngx_uint_t i, m; 323 ngx_uint_t i, m;
308 324
309 ngx_conf_merge_size_value(conf->imap_client_buffer_size, 325 ngx_conf_merge_size_value(conf->imap_client_buffer_size,
310 prev->imap_client_buffer_size, 326 prev->imap_client_buffer_size,
311 (size_t) ngx_pagesize); 327 (size_t) ngx_pagesize);
328 ngx_conf_merge_size_value(conf->smtp_client_buffer_size,
329 prev->smtp_client_buffer_size,
330 (size_t) ngx_pagesize);
331
312 ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000); 332 ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000);
333 ngx_conf_merge_msec_value(conf->smtp_greeting_delay,
334 prev->smtp_greeting_delay, 0);
335
313 ngx_conf_merge_uint_value(conf->protocol, prev->protocol, 336 ngx_conf_merge_uint_value(conf->protocol, prev->protocol,
314 NGX_MAIL_IMAP_PROTOCOL); 337 NGX_MAIL_IMAP_PROTOCOL);
315 ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0); 338 ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0);
316 339
317
318 ngx_conf_merge_bitmask_value(conf->pop3_auth_methods, 340 ngx_conf_merge_bitmask_value(conf->pop3_auth_methods,
319 prev->pop3_auth_methods, 341 prev->pop3_auth_methods,
320 (NGX_CONF_BITMASK_SET 342 (NGX_CONF_BITMASK_SET
321 |NGX_MAIL_AUTH_PLAIN_ENABLED)); 343 |NGX_MAIL_AUTH_PLAIN_ENABLED));
322 344
323 ngx_conf_merge_bitmask_value(conf->imap_auth_methods, 345 ngx_conf_merge_bitmask_value(conf->imap_auth_methods,
324 prev->imap_auth_methods, 346 prev->imap_auth_methods,
325 (NGX_CONF_BITMASK_SET 347 (NGX_CONF_BITMASK_SET
326 |NGX_MAIL_AUTH_PLAIN_ENABLED)); 348 |NGX_MAIL_AUTH_PLAIN_ENABLED));
327 349
328 ngx_conf_merge_bitmask_value(conf->smtp_auth_methods, 350 ngx_conf_merge_bitmask_value(conf->smtp_auth_methods,
329 prev->smtp_auth_methods, 351 prev->smtp_auth_methods,
330 (NGX_CONF_BITMASK_SET 352 (NGX_CONF_BITMASK_SET
331 |NGX_MAIL_AUTH_PLAIN_ENABLED 353 |NGX_MAIL_AUTH_PLAIN_ENABLED
332 |NGX_MAIL_AUTH_LOGIN_ENABLED)); 354 |NGX_MAIL_AUTH_LOGIN_ENABLED));
333 355
334 356
335 ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); 357 ngx_conf_merge_str_value(conf->server_name, prev->server_name, "");
336 358
337 if (conf->server_name.len == 0) { 359 if (conf->server_name.len == 0) {