3 files changed, 15 insertions, 12 deletions
diff --git a/src/event/modules/ngx_iocp_module.c b/src/event/modules/ngx_iocp_module.c
index 7b89227a3..9612c9ab9 100644
--- a/src/event/modules/ngx_iocp_module.c
+++ b/src/event/modules/ngx_iocp_module.c
@@ -110,7 +110,7 @@ static int ngx_iocp_init(ngx_cycle_t *cycle)
         return NGX_ERROR;
     }
 
-    ngx_io = ngx_os_io;
+    ngx_io = ngx_iocp_io;
 
     ngx_event_actions = ngx_iocp_module_ctx.actions;
 
@@ -233,16 +233,19 @@ static int ngx_iocp_process_events(ngx_log_t *log)
 ngx_log_debug(log, "iocp ev: %08x" _ ev);
 
         switch (key) {
-        case NGX_IOCP_IO:
-            ev->complete = 1;
-            ev->ready = 1;
-            break;
-
         case NGX_IOCP_ACCEPT:
             if (bytes) {
                 ev->ready = 1;
             }
             break;
+
+        case NGX_IOCP_IO:
+            ev->complete = 1;
+            ev->ready = 1;
+            break;
+
+        case NGX_IOCP_CONNECT:
+            ev->ready = 1;
         }
 
         ev->available = bytes;
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index d43fb0e15..1d43ba10e 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -460,7 +460,7 @@ static int ngx_kqueue_process_events(ngx_log_t *log)
 
         default:
             ngx_log_error(NGX_LOG_ALERT, log, 0,
-                          "unknown kevent filter %d" _ event_list[i].filter);
+                          "unexpected kevent filter %d" _ event_list[i].filter);
         }
     }
 
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 1cde073a1..9e7a08f94 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -265,9 +265,6 @@ static int ngx_select_process_events(ngx_log_t *log)
     timer = ngx_event_find_timer();
 
     if (timer) {
-        tv.tv_sec = timer / 1000;
-        tv.tv_usec = (timer % 1000) * 1000;
-        tp = &tv;
 #if (HAVE_SELECT_CHANGE_TIMEOUT)
         delta = 0;
 #else
@@ -275,10 +272,13 @@ static int ngx_select_process_events(ngx_log_t *log)
         delta = tv.tv_sec * 1000 + tv.tv_usec / 1000;
 #endif
 
+        tv.tv_sec = timer / 1000;
+        tv.tv_usec = (timer % 1000) * 1000;
+        tp = &tv;
+
     } else {
-        timer = 0;
-        tp = NULL;
         delta = 0;
+        tp = NULL;
     }
 
 #if !(WIN32)