diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2022-10-20 16:41:36 +0400 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2022-10-20 16:41:36 +0400 |
| commit | 3123fac3e764b4706881ffcb8f8b554c1628c5e0 (patch) | |
| tree | 0a8345c637b00eae13b983af54d9ab51426a6c72 /src/event/modules/ngx_iocp_module.c | |
| parent | 3cd06a3a9a1f815cbd5391211947d7aed4feb061 (diff) | |
| parent | 09d5305592c3ff8ff30e54dc3e9ce3dbac72cf59 (diff) | |
| download | nginx-3123fac3e764b4706881ffcb8f8b554c1628c5e0.tar.gz nginx-3123fac3e764b4706881ffcb8f8b554c1628c5e0.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/event/modules/ngx_iocp_module.c')
| -rw-r--r-- | src/event/modules/ngx_iocp_module.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/event/modules/ngx_iocp_module.c b/src/event/modules/ngx_iocp_module.c index b03944bb0..dca5cedff 100644 --- a/src/event/modules/ngx_iocp_module.c +++ b/src/event/modules/ngx_iocp_module.c @@ -231,9 +231,8 @@ ngx_iocp_del_connection(ngx_connection_t *c, ngx_uint_t flags) } -static -ngx_int_t ngx_iocp_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, - ngx_uint_t flags) +static ngx_int_t +ngx_iocp_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) { int rc; u_int key; @@ -356,7 +355,7 @@ ngx_iocp_create_conf(ngx_cycle_t *cycle) cf = ngx_palloc(cycle->pool, sizeof(ngx_iocp_conf_t)); if (cf == NULL) { - return NGX_CONF_ERROR; + return NULL; } cf->threads = NGX_CONF_UNSET; |