comparison src/event/ngx_event_accept.c @ 604:428c6e58046a NGINX_0_9_0

nginx 0.9.0 *) Feature: the "keepalive_disable" directive. *) Feature: the "map" directive supports variables as value of a defined variable. *) Feature: the "map" directive supports empty strings as value of the first parameter. *) Feature: the "map" directive supports expressions as the first parameter. *) Feature: nginx(8) manual page. Thanks to Sergey Osokin. *) Feature: Linux accept4() support. Thanks to Simon Liu. *) Workaround: elimination of Linux linker warning about "sys_errlist" and "sys_nerr"; the warning had appeared in 0.8.35. *) Bugfix: a segmentation fault might occur in a worker process, if the "auth_basic" directive was used. Thanks to Michail Laletin. *) Bugfix: compatibility with ngx_http_eval_module; the bug had appeared in 0.8.42.
author Igor Sysoev <http://sysoev.ru>
date Mon, 29 Nov 2010 00:00:00 +0300
parents c04fa65fe604
children 3036c1836a24
comparison
equal deleted inserted replaced
603:94ea26a3b3aa 604:428c6e58046a
44 "accept on %V, ready: %d", &ls->addr_text, ev->available); 44 "accept on %V, ready: %d", &ls->addr_text, ev->available);
45 45
46 do { 46 do {
47 socklen = NGX_SOCKADDRLEN; 47 socklen = NGX_SOCKADDRLEN;
48 48
49 #if (NGX_HAVE_ACCEPT4)
50 s = accept4(lc->fd, (struct sockaddr *) sa, &socklen, SOCK_NONBLOCK);
51 #else
49 s = accept(lc->fd, (struct sockaddr *) sa, &socklen); 52 s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
53 #endif
50 54
51 if (s == -1) { 55 if (s == -1) {
52 err = ngx_socket_errno; 56 err = ngx_socket_errno;
53 57
54 if (err == NGX_EAGAIN) { 58 if (err == NGX_EAGAIN) {