comparison src/os/unix/ngx_recv.c @ 1723:9b047c9e96c1 stable-0.5

r1587, r1588, r1589, r1590, r1592, r1599, r1629, r1636, r1674, r1681, r1682, r1683 merge: typo and style fixes
author Igor Sysoev <igor@sysoev.ru>
date Wed, 12 Dec 2007 20:49:45 +0000
parents 387450de0b4d
children
comparison
equal deleted inserted replaced
1722:3b7262e720c1 1723:9b047c9e96c1
9 #include <ngx_event.h> 9 #include <ngx_event.h>
10 10
11 11
12 #if (NGX_HAVE_KQUEUE) 12 #if (NGX_HAVE_KQUEUE)
13 13
14 ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size) 14 ssize_t
15 ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
15 { 16 {
16 ssize_t n; 17 ssize_t n;
17 ngx_err_t err; 18 ngx_err_t err;
18 ngx_event_t *rev; 19 ngx_event_t *rev;
19 20
75 /* 76 /*
76 * on FreeBSD recv() may return 0 on closed socket 77 * on FreeBSD recv() may return 0 on closed socket
77 * even if kqueue reported about available data 78 * even if kqueue reported about available data
78 */ 79 */
79 80
80 #if 0
81 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
82 "recv() returned 0 while kevent() reported "
83 "%d available bytes", rev->available);
84 #endif
85
86 rev->eof = 1; 81 rev->eof = 1;
87 rev->available = 0; 82 rev->available = 0;
88 } 83 }
89 84
90 return n; 85 return n;
124 return n; 119 return n;
125 } 120 }
126 121
127 #else /* ! NGX_HAVE_KQUEUE */ 122 #else /* ! NGX_HAVE_KQUEUE */
128 123
129 ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size) 124 ssize_t
125 ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
130 { 126 {
131 ssize_t n; 127 ssize_t n;
132 ngx_err_t err; 128 ngx_err_t err;
133 ngx_event_t *rev; 129 ngx_event_t *rev;
134 130