nginx-0.0.1-2003-07-02-18:41:17 import

3 files changed, 8 insertions, 6 deletions

diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 27396fcde..766d40328 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -190,10 +190,10 @@ static int ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags)
 
 static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
 {
-    ngx_event_t  *e;
+    ngx_event_t       *e;
+    ngx_connection_t  *c;
 
 #if (NGX_DEBUG_EVENT)
-    ngx_connection_t *c = ev->data;
     ngx_log_debug(c->log, "del event: %d, %d" _ c->fd _ event);
 #endif
 
@@ -209,6 +209,8 @@ static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
 
     /* we need to restore second event if it exists */
 
+    c = ev->data;
+
     if (event == NGX_READ_EVENT) {
         e = c->write;
         event = POLLOUT;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 263d88e36..7438fc168 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -235,12 +235,12 @@ ngx_log_debug(log, "TYPE: %d" _ ecf->use);
 }
 
 
-void ngx_worker(ngx_log_t *log)
+void ngx_worker(ngx_cycle_t *cycle)
 {
     for ( ;; ) {
-        ngx_log_debug(log, "ngx_worker cycle");
+        ngx_log_debug(cycle->log, "ngx_worker cycle");
 
-        ngx_process_events(log);
+        ngx_process_events(cycle->log);
     }
 }
 
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 8ae2b5385..393699f0a 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -371,7 +371,7 @@ int ngx_event_close_connection(ngx_event_t *ev);
 
 
 int  ngx_pre_thread(ngx_array_t *ls, ngx_pool_t *pool, ngx_log_t *log);
-void ngx_worker(ngx_log_t *log);
+void ngx_worker(ngx_cycle_t *cycle);
 
 
 /* ***************************** */