3 files changed, 10 insertions, 10 deletions
diff --git a/src/imap/ngx_imap.c b/src/imap/ngx_imap.c
index 7c1a42f8c..9fc5e2441 100644
--- a/src/imap/ngx_imap.c
+++ b/src/imap/ngx_imap.c
@@ -34,7 +34,7 @@ static ngx_core_module_t  ngx_imap_module_ctx = {
 
 
 ngx_module_t  ngx_imap_module = {
-    NGX_MODULE, 
+    NGX_MODULE_V1,
     &ngx_imap_module_ctx,                  /* module context */
     ngx_imap_commands,                     /* module directives */
     NGX_CORE_MODULE,                       /* module type */
diff --git a/src/imap/ngx_imap_handler.c b/src/imap/ngx_imap_handler.c
index 371d77f8e..f65db81f3 100644
--- a/src/imap/ngx_imap_handler.c
+++ b/src/imap/ngx_imap_handler.c
@@ -47,7 +47,7 @@ void ngx_imap_init_connection(ngx_connection_t *c)
         return;
     }
 
-    c->read->event_handler = ngx_imap_init_session;
+    c->read->handler = ngx_imap_init_session;
 
     ngx_add_timer(c->read, /* STUB */ 60000);
 
@@ -93,7 +93,7 @@ static void ngx_imap_init_session(ngx_event_t *rev)
         return;
     }
 
-    c->read->event_handler = ngx_pop3_auth_state;
+    c->read->handler = ngx_pop3_auth_state;
 
     ngx_pop3_auth_state(rev);
 }
diff --git a/src/imap/ngx_imap_proxy.c b/src/imap/ngx_imap_proxy.c
index 451fb3770..2b6e30e3a 100644
--- a/src/imap/ngx_imap_proxy.c
+++ b/src/imap/ngx_imap_proxy.c
@@ -82,9 +82,9 @@ void ngx_imap_proxy_init(ngx_imap_session_t *s)
     p->upstream.connection->data = s;
     p->upstream.connection->pool = s->connection->pool;
 
-    s->connection->read->event_handler = ngx_imap_proxy_block_read;
-    p->upstream.connection->read->event_handler = ngx_imap_proxy_auth_handler;
-    p->upstream.connection->write->event_handler = ngx_imap_proxy_dummy_handler;
+    s->connection->read->handler = ngx_imap_proxy_block_read;
+    p->upstream.connection->read->handler = ngx_imap_proxy_auth_handler;
+    p->upstream.connection->write->handler = ngx_imap_proxy_dummy_handler;
 }
 
 
@@ -200,10 +200,10 @@ static void ngx_imap_proxy_auth_handler(ngx_event_t *rev)
     s->proxy->buffer->pos = s->proxy->buffer->start;
     s->proxy->buffer->last = s->proxy->buffer->start;
 
-    s->connection->read->event_handler = ngx_imap_proxy_handler;
-    s->connection->write->event_handler = ngx_imap_proxy_handler;
-    rev->event_handler = ngx_imap_proxy_handler;
-    c->write->event_handler = ngx_imap_proxy_handler;
+    s->connection->read->handler = ngx_imap_proxy_handler;
+    s->connection->write->handler = ngx_imap_proxy_handler;
+    rev->handler = ngx_imap_proxy_handler;
+    c->write->handler = ngx_imap_proxy_handler;
 }