nginx-0.0.1-2002-08-15-21:20:26 import

1 files changed, 12 insertions, 7 deletions

diff --git a/src/event/ngx_event_read.c b/src/event/ngx_event_recv.c
index b08e5107e..75afcb854 100644
--- a/src/event/ngx_event_read.c
+++ b/src/event/ngx_event_recv.c
@@ -2,23 +2,28 @@
 #include <ngx_config.h>
 #include <ngx_errno.h>
 #include <ngx_log.h>
+#include <ngx_recv.h>
 #include <ngx_connection.h>
 
-int ngx_event_recv(ngx_connection_t *c, char *buf, size_t size)
+int ngx_event_recv_core(ngx_event_t *ev, char *buf, size_t size)
 {
-    int           n;
-    ngx_err_t     err;
-    ngx_event_t  *ev = c->read;
+    int                n;
+    ngx_err_t          err;
+    ngx_connection_t  *c;
+
+    c = (ngx_connection_t *) ev->data;
 
 #if (HAVE_KQUEUE)
+    ngx_log_debug(ev->log, "ngx_event_recv: eof:%d, avail:%d, err:%d" _
+                  ev->eof _ ev->available _ ev->error);
 #if !(USE_KQUEUE)
     if (ngx_event_type == NGX_KQUEUE_EVENT)
 #endif
         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",
-                             ev->log->action);
+                              "ngx_event_recv: recv failed while %s",
+                              ev->log->action);
 
                 return -1;
             }
@@ -27,7 +32,7 @@ int ngx_event_recv(ngx_connection_t *c, char *buf, size_t size)
         }
 #endif
 
-    n = recv(c->fd, buf, size, 0);
+    n = ngx_recv(c->fd, buf, size, 0);
 
     if (n == -1) {
         err = ngx_socket_errno;