Mercurial > hg > nginx

changeset 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 bf1655ae9a1c
children 162b2d27d4e1
files src/mail/ngx_mail.c
diffstat 1 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -36,13 +36,6 @@ static ngx_command_t  ngx_mail_commands[
       0,
       NULL },
 
-    { ngx_string("imap"),
-      NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_mail_block,
-      0,
-      0,
-      NULL },
-
       ngx_null_command
 };
 
@@ -83,12 +76,6 @@ ngx_mail_block(ngx_conf_t *cf, ngx_comma
     ngx_mail_core_srv_conf_t   **cscfp;
     ngx_mail_core_main_conf_t   *cmcf;
 
-    if (cmd->name.data[0] == 'i') {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "the \"imap\" directive is deprecated, "
-                           "use the \"mail\" directive instead");
-    }
-
     /* the main mail context */
 
     ctx = ngx_pcalloc(cf->pool, sizeof(ngx_mail_conf_ctx_t));