--- a/src/event/modules/ngx_iocp_module.c
+++ b/src/event/modules/ngx_iocp_module.c
@@ -1,28 +1,80 @@
+
+/*
+ * Copyright (C) 2002-2003 Igor Sysoev, http://sysoev.ru
+ */
+
 
 #include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
 
-#include <ngx_core.h>
-#include <ngx_log.h>
-#include <ngx_errno.h>
-#include <ngx_time.h>
-#include <ngx_connection.h>
-#include <ngx_event.h>
-#include <ngx_event_timer.h>
+
+typedef struct {
+    int  threads;
+} ngx_iocp_conf_t;
+
+
+static int ngx_iocp_init(ngx_log_t *log);
+static void ngx_iocp_done(ngx_log_t *log);
+static int ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key);
+static int ngx_iocp_process_events(ngx_log_t *log);
+static void *ngx_iocp_create_conf(ngx_pool_t *pool);
+static char *ngx_iocp_init_conf(ngx_pool_t *pool, void *conf);
+
 
-#include <ngx_iocp_module.h>
+static ngx_str_t      iocp_name = ngx_string("iocp");
+
+static ngx_command_t  ngx_iocp_commands[] = {
+
+    {ngx_string("iocp_threads"),
+     NGX_EVENT_CONF|NGX_CONF_TAKE1,
+     ngx_conf_set_num_slot,
+     0,
+     offsetof(ngx_iocp_conf_t, threads),
+     NULL},
+
+    ngx_null_command
+};
 
 
-int ngx_iocp_threads = 0;;
+ngx_event_module_t  ngx_iocp_module_ctx = {
+    &iocp_name,
+    ngx_iocp_create_conf,                  /* create configuration */
+    ngx_iocp_init_conf,                    /* init configuration */
+
+    {
+        ngx_iocp_add_event,                /* add an event */
+        NULL,                              /* delete an event */
+        NULL,                              /* enable an event */
+        NULL,                              /* disable an event */
+        NULL,                              /* add an connection */
+        NULL,                              /* delete an connection */
+        ngx_iocp_process_events,           /* process the events */
+        ngx_iocp_init,                     /* init the events */
+        ngx_iocp_done                      /* done the events */
+    }
+
+};
+
+ngx_module_t  ngx_iocp_module = {
+    NGX_MODULE,
+    &ngx_iocp_module_ctx,                  /* module context */
+    ngx_iocp_commands,                     /* module directives */
+    NGX_EVENT_MODULE,                      /* module type */
+    NULL                                   /* init module */
+};
 
 
-static HANDLE        iocp;
-static ngx_event_t  *timer_queue;
+static HANDLE  iocp;
 
 
-int ngx_iocp_init(int max_connections, ngx_log_t *log)
+static int ngx_iocp_init(ngx_log_t *log)
 {
-    iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE,
-                                  NULL, 0, ngx_iocp_threads);
+    ngx_iocp_conf_t  *cf;
+
+    cf = ngx_event_get_conf(ngx_iocp_module);
+
+    iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, cf->threads);
 
     if (iocp == NULL) {
         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
@@ -30,12 +82,11 @@ int ngx_iocp_init(int max_connections, n
         return NGX_ERROR;
     }
 
-    timer_queue = ngx_event_init_timer(log);
-    if (timer_queue == NULL) {
+    if (ngx_event_timer_init(log) == NGX_ERROR) {
         return NGX_ERROR;
     }
 
-    ngx_event_actions.process = ngx_iocp_process_events;
+    ngx_event_actions = ngx_iocp_module_ctx.actions;
 
     ngx_event_flags = NGX_HAVE_AIO_EVENT|NGX_HAVE_IOCP_EVENT;
 
@@ -43,15 +94,26 @@ int ngx_iocp_init(int max_connections, n
 }
 
 
-int ngx_iocp_add_event(ngx_event_t *ev)
+static void ngx_iocp_done(ngx_log_t *log)
+{
+    if (CloseHandle(iocp) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+        "iocp CloseHandle() failed");
+    }
+
+    ngx_event_timer_done(log);
+}
+
+
+static int ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key)
 {
     ngx_connection_t  *c;
 
     c = (ngx_connection_t *) ev->data;
 
-    ngx_log_debug(ev->log, "iocp: %d, %08x:%08x" _ c->fd _ ev _ &ev->ovlp);
+    ngx_log_debug(ev->log, "iocp add: %d, %08x:%08x" _ c->fd _ key _ &ev->ovlp);
 
-    if (CreateIoCompletionPort((HANDLE) c->fd, iocp, (DWORD) ev, 0) == NULL) {
+    if (CreateIoCompletionPort((HANDLE) c->fd, iocp, key, 0) == NULL) {
         ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
                       "CreateIoCompletionPort() failed");
         return NGX_ERROR;
@@ -61,17 +123,16 @@ int ngx_iocp_add_event(ngx_event_t *ev)
 }
 
 
-int ngx_iocp_process_events(ngx_log_t *log)
+static int ngx_iocp_process_events(ngx_log_t *log)
 {
     int                rc;
+    u_int              key;
     size_t             bytes;
     ngx_err_t          err;
     ngx_msec_t         timer, delta;
-    ngx_event_t       *ev, *e;
+    ngx_event_t       *ev;
     ngx_event_ovlp_t  *ovlp;
 
-    ngx_log_debug(log, "iocp");
-
     timer = ngx_event_find_timer();
 
     if (timer) {
@@ -84,15 +145,12 @@ int ngx_iocp_process_events(ngx_log_t *l
 
     ngx_log_debug(log, "iocp timer: %d" _ timer);
 
-#if 1
-    rc = GetQueuedCompletionStatus(iocp, &bytes, (LPDWORD) &e,
+    rc = GetQueuedCompletionStatus(iocp, &bytes, (LPDWORD) &key,
                                    (LPOVERLAPPED *) &ovlp, timer);
-    ngx_log_debug(log, "iocp: %d, %d:%08x:%08x" _ rc _ bytes _ e _ ovlp);
+
+    ngx_log_debug(log, "iocp: %d, %d:%08x:%08x" _ rc _ bytes _ key _ ovlp);
+
     if (rc == 0) {
-#else
-    if (GetQueuedCompletionStatus(iocp, &bytes, (LPDWORD) &e,
-                                  (LPOVERLAPPED *) &ovlp, timer) == 0) {
-#endif
         err = ngx_errno;
 
         if (ovlp == NULL) {
@@ -118,16 +176,43 @@ int ngx_iocp_process_events(ngx_log_t *l
 
 ngx_log_debug(log, "iocp ev: %08x" _ ev);
 
-        if (ev == e) {
-            /* it's not AcceptEx() completion */
+        switch (key) {
+        case NGX_IOCP_IO:
             ev->ready = 1;
             ev->available = bytes;
+            break;
+
+        case NGX_IOCP_ACCEPT:
+            break;
         }
 
-ngx_log_debug(log, "iocp ev: %08x" _ ev->event_handler);
+ngx_log_debug(log, "iocp ev handler: %08x" _ ev->event_handler);
 
         ev->event_handler(ev);
     }
 
     return NGX_OK;
 }
+
+
+static void *ngx_iocp_create_conf(ngx_pool_t *pool)
+{
+    ngx_iocp_conf_t  *cf;
+
+    ngx_test_null(cf, ngx_palloc(pool, sizeof(ngx_iocp_conf_t)),
+                  NGX_CONF_ERROR);
+
+    cf->threads = NGX_CONF_UNSET;
+
+    return cf;
+}
+
+
+static char *ngx_iocp_init_conf(ngx_pool_t *pool, void *conf)
+{
+    ngx_iocp_conf_t *cf = conf;
+
+    ngx_conf_init_value(cf->threads, 0);
+
+    return NGX_CONF_OK;
+}