Mercurial > hg > nginx-vendor-current

comparison src/event/ngx_event_accept.c @ 608:3036c1836a24 NGINX_0_9_2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.9.2 *) Feature: the "If-Unmodified-Since" client request header line support. *) Workaround: fallback to accept() syscall if accept4() was not implemented; the issue had appeared in 0.9.0. *) Bugfix: nginx could not be built on Cygwin; the issue had appeared in 0.9.0. *) Bugfix: for OpenSSL vulnerability CVE-2010-4180. Thanks to Maxim Dounin.
author Igor Sysoev <http://sysoev.ru>
date Mon, 06 Dec 2010 00:00:00 +0300
parents 428c6e58046a
children d0f7a625f27c
comparison
equal deleted inserted replaced
607:a87726a9033b 608:3036c1836a24
24 ngx_event_t *rev, *wev; 24 ngx_event_t *rev, *wev;
25 ngx_listening_t *ls; 25 ngx_listening_t *ls;
26 ngx_connection_t *c, *lc; 26 ngx_connection_t *c, *lc;
27 ngx_event_conf_t *ecf; 27 ngx_event_conf_t *ecf;
28 u_char sa[NGX_SOCKADDRLEN]; 28 u_char sa[NGX_SOCKADDRLEN];
29 #if (NGX_HAVE_ACCEPT4)
30 static ngx_uint_t use_accept4 = 1;
31 #endif
29 32
30 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module); 33 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module);
31 34
32 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { 35 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) {
33 ev->available = 1; 36 ev->available = 1;
45 48
46 do { 49 do {
47 socklen = NGX_SOCKADDRLEN; 50 socklen = NGX_SOCKADDRLEN;
48 51
49 #if (NGX_HAVE_ACCEPT4) 52 #if (NGX_HAVE_ACCEPT4)
50 s = accept4(lc->fd, (struct sockaddr *) sa, &socklen, SOCK_NONBLOCK); 53 if (use_accept4) {
54 s = accept4(lc->fd, (struct sockaddr *) sa, &socklen,
55 SOCK_NONBLOCK);
56 } else {
57 s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
58 }
51 #else 59 #else
52 s = accept(lc->fd, (struct sockaddr *) sa, &socklen); 60 s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
53 #endif 61 #endif
54 62
55 if (s == -1) { 63 if (s == -1) {
59 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err, 67 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err,
60 "accept() not ready"); 68 "accept() not ready");
61 return; 69 return;
62 } 70 }
63 71
72 #if (NGX_HAVE_ACCEPT4)
73 ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
74 NGX_LOG_ERR : NGX_LOG_ALERT),
75 ev->log, err,
76 use_accept4 ? "accept4() failed" : "accept() failed");
77
78 if (use_accept4 && err == NGX_ENOSYS) {
79 use_accept4 = 0;
80 ngx_inherited_nonblocking = 0;
81 continue;
82 }
83 #else
64 ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ? 84 ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
65 NGX_LOG_ERR : NGX_LOG_ALERT), 85 NGX_LOG_ERR : NGX_LOG_ALERT),
66 ev->log, err, "accept() failed"); 86 ev->log, err, "accept() failed");
87 #endif
67 88
68 if (err == NGX_ECONNABORTED) { 89 if (err == NGX_ECONNABORTED) {
69 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { 90 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
70 ev->available--; 91 ev->available--;
71 } 92 }