nginx-0.0.4-2004-06-11-10:15:08 import

diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index 5d957ecffe0a9cff056232a818c4b152fbfec04a..4ab23888851fb9fecc57817e0f3dd316b45c11f4 100644 (file)
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -484,7 +484,7 @@ ngx_int_t ngx_rtsig_process_events(ngx_cycle_t *cycle)
         overflow_current = 0;
         ngx_event_actions.process = ngx_rtsig_process_overflow;
 
-        return NGX_OK;
+        return NGX_ERROR;
 
     } else if (signo != -1) {
         ngx_accept_mutex_unlock();

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index b4211be942be9838269c43a3d6fe9478f10ab968..208d17117c7173c2f57636416a5331e2c1b8c03c 100644 (file)
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -189,7 +189,7 @@ static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle)
 
     shared = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0);
 
-    if (shared == NULL) {
+    if (shared == MAP_FAILED) {
         ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                       "mmap(MAP_ANON|MAP_SHARED) failed");
         return NGX_ERROR;