commit 43f131923f25600c771e014a7eebf74d407776a7
author Igor Sysoev <igor@sysoev.ru> Mon Apr 12 16:38:09 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Apr 12 16:38:09 2004 +0000
tree 19e9a678f68d0d434fbcc13c52c9507bfc66eb28
parent 076498e356546713a4b40edea95bcc1a30c45a98

nginx-0.0.3-2004-04-12-20:38:09 import

src/event/modules/ngx_epoll_module.c

diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 1d38779..ab0c192 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -263,6 +263,7 @@
 
     if (flags & NGX_CLOSE_EVENT) {
         ev->active = 0;
+        ev->posted = 0;
         return NGX_OK;
     }
 
@@ -437,10 +438,6 @@
         log = c->log ? c->log : cycle->log;
 #endif
 
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0,
-                       "epoll: fd:%d ev:%04X d:" PTR_FMT,
-                       c->fd, event_list[i].events, event_list[i].data);
-
         if (c->read->instance != instance) {
 
             /*
@@ -453,6 +450,10 @@
             continue;
         }
 
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0,
+                       "epoll: fd:%d ev:%04X d:" PTR_FMT,
+                       c->fd, event_list[i].events, event_list[i].data);
+
         if (event_list[i].events & (EPOLLERR|EPOLLHUP)) {
             ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
                            "epoll_wait() error on fd:%d ev:%04X",

src/event/modules/ngx_kqueue_module.c

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index abc577b..6564e9a 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -263,6 +263,7 @@
      */
 
     if (flags & NGX_CLOSE_EVENT) {
+        ev->posted = 0;
         return NGX_OK;
     }
 
@@ -464,10 +465,6 @@
             ev = (ngx_event_t *) ((uintptr_t) ev & (uintptr_t) ~1);
             ev->returned_instance = instance;
 
-            if (ev->log && (ev->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
-                ngx_kqueue_dump_event(ev->log, &event_list[i]);
-            }
-
             if (!ev->active || ev->instance != instance) {
 
                 /*
@@ -480,6 +477,10 @@
                 continue;
             }
 
+            if (ev->log && (ev->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
+                ngx_kqueue_dump_event(ev->log, &event_list[i]);
+            }
+
             ev->available = event_list[i].data;
 
             if (event_list[i].flags & EV_EOF) {

src/event/ngx_event.c

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 70a533f..002d296 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -59,8 +59,6 @@
 
 
 
-static ngx_str_t  events_name = ngx_string("events");
-
 static ngx_command_t  ngx_events_commands[] = {
 
     { ngx_string("events"),
@@ -73,10 +71,17 @@
       ngx_null_command
 };
 
+    
+static ngx_core_module_t  ngx_events_module_ctx = {
+    ngx_string("events"),
+    NULL,
+    NULL
+};  
+
 
 ngx_module_t  ngx_events_module = {
     NGX_MODULE,
-    &events_name,                          /* module context */
+    &ngx_events_module_ctx,                /* module context */
     ngx_events_commands,                   /* module directives */
     NGX_CORE_MODULE,                       /* module type */
     NULL,                                  /* init module */