summaryrefslogtreecommitdiffhomepage
path: root/src/event
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2016-06-29 14:30:00 +0300
committerRuslan Ermilov <ru@nginx.com>2016-06-29 14:30:00 +0300
commitfb6c764921dff3322b33ed2f5169b4c23f84bd9c (patch)
treeb6c0523c7f46b80e738a52030ef6a09cd18c1f1b /src/event
parentdcf3d20874b0f61ccb74daeb19266198fb3413fc (diff)
downloadnginx-fb6c764921dff3322b33ed2f5169b4c23f84bd9c.tar.gz
nginx-fb6c764921dff3322b33ed2f5169b4c23f84bd9c.tar.bz2
Removed unused flag accept_context_updated from ngx_event_t.
Also, removed practically unused flag accept_context_updated from ngx_connection_t.
Diffstat (limited to 'src/event')
-rw-r--r--src/event/ngx_event.h5
-rw-r--r--src/event/ngx_event_acceptex.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 1c7c14873..394a0e8e5 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -76,11 +76,6 @@ struct ngx_event_s {
unsigned cancelable:1;
-#if (NGX_WIN32)
- /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was successful */
- unsigned accept_context_updated:1;
-#endif
-
#if (NGX_HAVE_KQUEUE)
unsigned kq_vnode:1;
diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c
index e414fe446..1999faf20 100644
--- a/src/event/ngx_event_acceptex.c
+++ b/src/event/ngx_event_acceptex.c
@@ -41,8 +41,8 @@ ngx_event_acceptex(ngx_event_t *rev)
ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
"setsockopt(SO_UPDATE_ACCEPT_CONTEXT) failed for %V",
&c->addr_text);
- } else {
- c->accept_context_updated = 1;
+ /* TODO: close socket */
+ return;
}
ngx_getacceptexsockaddrs(c->buffer->pos,