Mercurial > hg > nginx-vendor-0-7
comparison src/event/ngx_event_accept.c @ 4:4b2dafa26fe2 NGINX_0_1_2
nginx 0.1.2
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; bug appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; bug appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 21 Oct 2004 00:00:00 +0400 |
parents | f0b350454894 |
children | 46833bd150cb |
comparison
equal
deleted
inserted
replaced
3:8beaf7b3241f | 4:4b2dafa26fe2 |
---|---|
37 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module); | 37 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module); |
38 | 38 |
39 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { | 39 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { |
40 ev->available = 1; | 40 ev->available = 1; |
41 | 41 |
42 } else if (!(ngx_event_flags & NGX_HAVE_KQUEUE_EVENT)) { | 42 } else if (!(ngx_event_flags & NGX_USE_KQUEUE_EVENT)) { |
43 ev->available = ecf->multi_accept; | 43 ev->available = ecf->multi_accept; |
44 } | 44 } |
45 | 45 |
46 ls = ev->data; | 46 ls = ev->data; |
47 | 47 |
116 ngx_log_error(NGX_LOG_ALERT, ev->log, err, | 116 ngx_log_error(NGX_LOG_ALERT, ev->log, err, |
117 "accept() on %s failed", | 117 "accept() on %s failed", |
118 ls->listening->addr_text.data); | 118 ls->listening->addr_text.data); |
119 | 119 |
120 if (err == NGX_ECONNABORTED) { | 120 if (err == NGX_ECONNABORTED) { |
121 if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { | 121 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { |
122 ev->available--; | 122 ev->available--; |
123 } | 123 } |
124 | 124 |
125 if (ev->available) { | 125 if (ev->available) { |
126 /* reuse the previously allocated pool */ | 126 /* reuse the previously allocated pool */ |
340 log->data = NULL; | 340 log->data = NULL; |
341 log->handler = NULL; | 341 log->handler = NULL; |
342 | 342 |
343 ls->listening->handler(c); | 343 ls->listening->handler(c); |
344 | 344 |
345 if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { | 345 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { |
346 ev->available--; | 346 ev->available--; |
347 } | 347 } |
348 | 348 |
349 accepted++; | 349 accepted++; |
350 | 350 |