From 4e5e1171085a2235863baf7dddbd1477f817ae58 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 22 Aug 2002 15:24:03 +0000
Subject: nginx-0.0.1-2002-08-22-19:24:03 import

---
 src/event/ngx_event.c      |  2 +-
 src/event/ngx_event_recv.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/event')

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 27f5b5872..57c3c1ca7 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -19,7 +19,7 @@ ngx_event_t         *ngx_read_events, *ngx_write_events;
 
 #if !(USE_KQUEUE)
 
-#if 0
+#if 1
 ngx_event_type_e     ngx_event_type = NGX_SELECT_EVENT;
 #else
 ngx_event_type_e     ngx_event_type = NGX_KQUEUE_EVENT;
diff --git a/src/event/ngx_event_recv.c b/src/event/ngx_event_recv.c
index 75afcb854..1874b913f 100644
--- a/src/event/ngx_event_recv.c
+++ b/src/event/ngx_event_recv.c
@@ -1,5 +1,6 @@
 
 #include <ngx_config.h>
+#include <ngx_core.h>
 #include <ngx_errno.h>
 #include <ngx_log.h>
 #include <ngx_recv.h>
@@ -22,10 +23,10 @@ int ngx_event_recv_core(ngx_event_t *ev, char *buf, size_t size)
         if (ev->eof && ev->available == 0) {
             if (ev->error) {
                 ngx_log_error(NGX_LOG_ERR, ev->log, ev->error,
-                              "ngx_event_recv: recv failed while %s",
+                              "ngx_event_recv: recv() failed while %s",
                               ev->log->action);
 
-                return -1;
+                return NGX_ERROR;
             }
 
             return 0;
@@ -39,14 +40,16 @@ int ngx_event_recv_core(ngx_event_t *ev, char *buf, size_t size)
 
         if (err == NGX_EAGAIN) {
             ngx_log_error(NGX_LOG_INFO, ev->log, err,
-                          "ngx_event_recv: EAGAIN while %s", ev->log->action);
-            return -2;
+                          "ngx_event_recv: recv() returns EAGAIN while %s",
+                          ev->log->action);
+            return NGX_AGAIN;
         }
 
         ngx_log_error(NGX_LOG_INFO, ev->log, err,
-                      "ngx_event_recv: recv failed while %s", ev->log->action);
+                      "ngx_event_recv: recv() failed while %s",
+                      ev->log->action);
 
-        return -1;
+        return NGX_ERROR;
     }
 
 #if (HAVE_KQUEUE)
-- 
cgit