Mercurial > hg > nginx-vendor-0-8
diff src/event/modules/ngx_select_module.c @ 324:f7cd062ee035 NGINX_0_6_6
nginx 0.6.6
*) Feature: the --sysconfdir=PATH option in configure.
*) Feature: named locations.
*) Feature: the $args variable can be set with the "set" directive.
*) Feature: the $is_args variable.
*) Bugfix: fair big weight upstream balancer.
*) Bugfix: if a client has closed connection to mail proxy then nginx
might not close connection to backend.
*) Bugfix: if the same host without specified port was used as backend
for HTTP and HTTPS, then nginx used only one port - 80 or 443.
*) Bugfix: fix building on Solaris/amd64 by Sun Studio 11 and early
versions; bug appeared in 0.6.4.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 30 Jul 2007 00:00:00 +0400 |
parents | c982febb7588 |
children | b743d290eb3b |
line wrap: on
line diff
--- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -12,8 +12,10 @@ static ngx_int_t ngx_select_init(ngx_cycle_t *cycle, ngx_msec_t timer); static void ngx_select_done(ngx_cycle_t *cycle); -static ngx_int_t ngx_select_add_event(ngx_event_t *ev, int event, u_int flags); -static ngx_int_t ngx_select_del_event(ngx_event_t *ev, int event, u_int flags); +static ngx_int_t ngx_select_add_event(ngx_event_t *ev, ngx_int_t event, + ngx_uint_t flags); +static ngx_int_t ngx_select_del_event(ngx_event_t *ev, ngx_int_t event, + ngx_uint_t flags); static ngx_int_t ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags); static char *ngx_select_init_conf(ngx_cycle_t *cycle, void *conf); @@ -25,10 +27,10 @@ static fd_set work_read_fd_set; static fd_set work_write_fd_set; #if (NGX_WIN32) -static int max_read; -static int max_write; +static ngx_uint_t max_read; +static ngx_uint_t max_write; #else -static int max_fd; +static ngx_int_t max_fd; #endif static ngx_uint_t nevents; @@ -129,18 +131,18 @@ ngx_select_done(ngx_cycle_t *cycle) static ngx_int_t -ngx_select_add_event(ngx_event_t *ev, int event, u_int flags) +ngx_select_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) { ngx_connection_t *c; c = ev->data; ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "select add event fd:%d ev:%d", c->fd, event); + "select add event fd:%d ev:%i", c->fd, event); if (ev->index != NGX_INVALID_INDEX) { ngx_log_error(NGX_LOG_ALERT, ev->log, 0, - "select event fd:%d ev:%d is already set", c->fd, event); + "select event fd:%d ev:%i is already set", c->fd, event); return NGX_OK; } @@ -190,7 +192,7 @@ ngx_select_add_event(ngx_event_t *ev, in static ngx_int_t -ngx_select_del_event(ngx_event_t *ev, int event, u_int flags) +ngx_select_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) { ngx_connection_t *c; @@ -203,7 +205,7 @@ ngx_select_del_event(ngx_event_t *ev, in } ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "select del event fd:%d ev:%d", c->fd, event); + "select del event fd:%d ev:%i", c->fd, event); #if (NGX_WIN32) @@ -231,7 +233,7 @@ ngx_select_del_event(ngx_event_t *ev, in #endif - if (ev->index < (u_int) --nevents) { + if (ev->index < --nevents) { event_index[ev->index] = event_index[nevents]; event_index[ev->index]->index = ev->index; }