diff options
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/modules/ngx_iocp_module.c | 8 | ||||
| -rw-r--r-- | src/event/modules/ngx_iocp_module.h | 2 | ||||
| -rw-r--r-- | src/event/ngx_event.c | 4 | ||||
| -rw-r--r-- | src/event/ngx_event_connect.c | 6 | ||||
| -rw-r--r-- | src/event/ngx_event_connect.h | 1 |
5 files changed, 13 insertions, 8 deletions
diff --git a/src/event/modules/ngx_iocp_module.c b/src/event/modules/ngx_iocp_module.c index 2056fd6dd..cd769141d 100644 --- a/src/event/modules/ngx_iocp_module.c +++ b/src/event/modules/ngx_iocp_module.c @@ -30,11 +30,11 @@ static ngx_command_t ngx_iocp_commands[] = { offsetof(ngx_iocp_conf_t, threads), NULL}, - {ngx_string("acceptex"), + {ngx_string("post_acceptex"), NGX_EVENT_CONF|NGX_CONF_TAKE1, ngx_conf_set_num_slot, 0, - offsetof(ngx_iocp_conf_t, acceptex), + offsetof(ngx_iocp_conf_t, post_acceptex), NULL}, {ngx_string("acceptex_read"), @@ -266,7 +266,7 @@ static void *ngx_iocp_create_conf(ngx_cycle_t *cycle) NGX_CONF_ERROR); cf->threads = NGX_CONF_UNSET; - cf->acceptex = NGX_CONF_UNSET; + cf->post_acceptex = NGX_CONF_UNSET; cf->acceptex_read = NGX_CONF_UNSET; return cf; @@ -278,7 +278,7 @@ static char *ngx_iocp_init_conf(ngx_cycle_t *cycle, void *conf) ngx_iocp_conf_t *cf = conf; ngx_conf_init_value(cf->threads, 0); - ngx_conf_init_value(cf->acceptex, 10); + ngx_conf_init_value(cf->post_acceptex, 10); ngx_conf_init_value(cf->acceptex_read, 1); return NGX_CONF_OK; diff --git a/src/event/modules/ngx_iocp_module.h b/src/event/modules/ngx_iocp_module.h index 7b61a46f3..a1c1efd3d 100644 --- a/src/event/modules/ngx_iocp_module.h +++ b/src/event/modules/ngx_iocp_module.h @@ -4,7 +4,7 @@ typedef struct { int threads; - int acceptex; + int post_acceptex; int acceptex_read; } ngx_iocp_conf_t; diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index a4c3c9c65..03be86a55 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -264,7 +264,9 @@ static int ngx_event_init(ngx_cycle_t *cycle) } iocpcf = ngx_event_get_conf(cycle->conf_ctx, ngx_iocp_module); - if (ngx_event_post_acceptex(&s[i], iocpcf->acceptex) == NGX_ERROR) { + if (ngx_event_post_acceptex(&s[i], iocpcf->post_acceptex) + == NGX_ERROR) + { return NGX_ERROR; } diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c index b11ccd4ef..7b5e9a6e0 100644 --- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -179,6 +179,8 @@ int ngx_event_connect_peer(ngx_peer_connection_t *pc) c->fd = s; + c->log_error = pc->log_error; + pc->connection = c; /* @@ -212,10 +214,10 @@ int ngx_event_connect_peer(ngx_peer_connection_t *pc) if (rc == -1) { err = ngx_socket_errno; - /* Winsock returns WSAEWOULDBLOCK */ + /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */ if (err != NGX_EINPROGRESS && err != NGX_EAGAIN) { - ngx_log_error(NGX_LOG_ERR, pc->log, err, "connect() failed"); + ngx_connection_error(c, err, "connect() failed"); if (ngx_close_socket(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h index eb8b64b22..1534c1436 100644 --- a/src/event/ngx_event_connect.h +++ b/src/event/ngx_event_connect.h @@ -47,6 +47,7 @@ typedef struct { ngx_log_t *log; unsigned cached:1; + unsigned log_error:2; /* ngx_connection_log_error_e */ } ngx_peer_connection_t; |