Mercurial > hg > nginx
diff src/event/modules/ngx_iocp_module.c @ 501:d4ea69372b94 release-0.1.25
nginx-0.1.25-RELEASE import
*) Bugfix: nginx did run on Linux parisc.
*) Feature: nginx now does not start under FreeBSD if the sysctl
kern.ipc.somaxconn value is too big.
*) Bugfix: if a request was internally redirected by the
ngx_http_index_module module to the ngx_http_proxy_module or
ngx_http_fastcgi_module modules, then the index file was not closed
after request completion.
*) Feature: the "proxy_pass" can be used in location with regular
expression.
*) Feature: the ngx_http_rewrite_filter_module module supports the
condition like "if ($HTTP_USER_AGENT ~ MSIE)".
*) Bugfix: nginx started too slow if the large number of addresses and
text values were used in the "geo" directive.
*) Change: a variable name must be declared as "$name" in the "geo"
directive. The previous variant without "$" is still supported, but
will be removed soon.
*) Feature: the "%{VARIABLE}v" logging parameter.
*) Feature: the "set $name value" directive.
*) Bugfix: gcc 4.0 compatibility.
*) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 19 Mar 2005 12:38:37 +0000 |
parents | a88a3e4e158f |
children | 9b8c906f6e63 |
line wrap: on
line diff
--- a/src/event/modules/ngx_iocp_module.c +++ b/src/event/modules/ngx_iocp_module.c @@ -90,7 +90,8 @@ ngx_os_io_t ngx_iocp_io = { static HANDLE iocp; -static ngx_int_t ngx_iocp_init(ngx_cycle_t *cycle) +static ngx_int_t +ngx_iocp_init(ngx_cycle_t *cycle) { ngx_iocp_conf_t *cf; @@ -117,7 +118,8 @@ static ngx_int_t ngx_iocp_init(ngx_cycle } -static void ngx_iocp_done(ngx_cycle_t *cycle) +static void +ngx_iocp_done(ngx_cycle_t *cycle) { if (CloseHandle(iocp) == -1) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, @@ -128,7 +130,8 @@ static void ngx_iocp_done(ngx_cycle_t *c } -static ngx_int_t ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key) +static ngx_int_t +ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key) { ngx_connection_t *c; @@ -150,7 +153,8 @@ static ngx_int_t ngx_iocp_add_event(ngx_ } -static ngx_int_t ngx_iocp_del_connection(ngx_connection_t *c, u_int flags) +static ngx_int_t +ngx_iocp_del_connection(ngx_connection_t *c, u_int flags) { #if 0 if (flags & NGX_CLOSE_EVENT) { @@ -167,7 +171,8 @@ static ngx_int_t ngx_iocp_del_connection } -static ngx_int_t ngx_iocp_process_events(ngx_cycle_t *cycle) +static +ngx_int_t ngx_iocp_process_events(ngx_cycle_t *cycle) { int rc; u_int key; @@ -301,12 +306,15 @@ static ngx_int_t ngx_iocp_process_events } -static void *ngx_iocp_create_conf(ngx_cycle_t *cycle) +static void * +ngx_iocp_create_conf(ngx_cycle_t *cycle) { ngx_iocp_conf_t *cf; - ngx_test_null(cf, ngx_palloc(cycle->pool, sizeof(ngx_iocp_conf_t)), - NGX_CONF_ERROR); + cf = ngx_palloc(cycle->pool, sizeof(ngx_iocp_conf_t)); + if (cf == NULL) { + return NGX_CONF_ERROR; + } cf->threads = NGX_CONF_UNSET; cf->post_acceptex = NGX_CONF_UNSET; @@ -316,7 +324,8 @@ static void *ngx_iocp_create_conf(ngx_cy } -static char *ngx_iocp_init_conf(ngx_cycle_t *cycle, void *conf) +static char * +ngx_iocp_init_conf(ngx_cycle_t *cycle, void *conf) { ngx_iocp_conf_t *cf = conf;