# HG changeset patch
# User Ruslan Ermilov <ru@nginx.com>
# Date 1430304804 -10800
# Node ID 53bccdc4923aca2652fc8f47da39a0a91f54c81d
# Parent  bf1655ae9a1c29440392fb08dd1a440ee5009e8a
Removed the deprecated "imap" directive.

diff -r bf1655ae9a1c -r 53bccdc4923a src/mail/ngx_mail.c
--- a/src/mail/ngx_mail.c	Wed Apr 29 13:53:08 2015 +0300
+++ b/src/mail/ngx_mail.c	Wed Apr 29 13:53:24 2015 +0300
@@ -36,13 +36,6 @@
       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_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));