Mercurial > hg > nginx-vendor-current

comparison src/event/ngx_event.c @ 484:ed5e10fb40fc NGINX_0_7_54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.54 *) Feature: the ngx_http_image_filter_module. *) Feature: the "proxy_ignore_headers" and "fastcgi_ignore_headers" directives. *) Bugfix: a segmentation fault might occur in worker process, if an "open_file_cache_errors off" directive was used; the bug had appeared in 0.7.53. *) Bugfix: the "port_in_redirect off" directive did not work; the bug had appeared in 0.7.39. *) Bugfix: improve handling of "select" method errors. *) Bugfix: of "select() failed (10022: ...)" error in nginx/Windows. *) Bugfix: in error text descriptions in nginx/Windows; the bug had appeared in 0.7.53.
author Igor Sysoev <http://sysoev.ru>
date Fri, 01 May 2009 00:00:00 +0400
parents 549994537f15
children f39b9e29530d
comparison
equal deleted inserted replaced
483:0a2f4b42ddad 484:ed5e10fb40fc
774 if (ngx_event_flags & NGX_USE_IOCP_EVENT) { 774 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
775 ngx_iocp_conf_t *iocpcf; 775 ngx_iocp_conf_t *iocpcf;
776 776
777 rev->handler = ngx_event_acceptex; 777 rev->handler = ngx_event_acceptex;
778 778
779 if (ngx_use_accept_mutex) {
780 continue;
781 }
782
779 if (ngx_add_event(rev, 0, NGX_IOCP_ACCEPT) == NGX_ERROR) { 783 if (ngx_add_event(rev, 0, NGX_IOCP_ACCEPT) == NGX_ERROR) {
780 return NGX_ERROR; 784 return NGX_ERROR;
781 } 785 }
782 786
783 ls[i].log.handler = ngx_acceptex_log_error; 787 ls[i].log.handler = ngx_acceptex_log_error;
789 return NGX_ERROR; 793 return NGX_ERROR;
790 } 794 }
791 795
792 } else { 796 } else {
793 rev->handler = ngx_event_accept; 797 rev->handler = ngx_event_accept;
798
799 if (ngx_use_accept_mutex) {
800 continue;
801 }
794 802
795 if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) { 803 if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
796 return NGX_ERROR; 804 return NGX_ERROR;
797 } 805 }
798 } 806 }