Mercurial > hg > nginx

comparison src/mail/ngx_mail.c @ 6142:53bccdc4923a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the deprecated "imap" directive.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 29 Apr 2015 13:53:24 +0300
parents fc99323a3d79
children 3c344ea7d88b
comparison
equal deleted inserted replaced
6141:bf1655ae9a1c 6142:53bccdc4923a
28 28
29 29
30 static ngx_command_t ngx_mail_commands[] = { 30 static ngx_command_t ngx_mail_commands[] = {
31 31
32 { ngx_string("mail"), 32 { ngx_string("mail"),
33 NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
34 ngx_mail_block,
35 0,
36 0,
37 NULL },
38
39 { ngx_string("imap"),
40 NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS, 33 NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
41 ngx_mail_block, 34 ngx_mail_block,
42 0, 35 0,
43 0, 36 0,
44 NULL }, 37 NULL },
81 ngx_mail_module_t *module; 74 ngx_mail_module_t *module;
82 ngx_mail_conf_ctx_t *ctx; 75 ngx_mail_conf_ctx_t *ctx;
83 ngx_mail_core_srv_conf_t **cscfp; 76 ngx_mail_core_srv_conf_t **cscfp;
84 ngx_mail_core_main_conf_t *cmcf; 77 ngx_mail_core_main_conf_t *cmcf;
85 78
86 if (cmd->name.data[0] == 'i') {
87 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88 "the \"imap\" directive is deprecated, "
89 "use the \"mail\" directive instead");
90 }
91
92 /* the main mail context */ 79 /* the main mail context */
93 80
94 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_mail_conf_ctx_t)); 81 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_mail_conf_ctx_t));
95 if (ctx == NULL) { 82 if (ctx == NULL) {
96 return NGX_CONF_ERROR; 83 return NGX_CONF_ERROR;