Mercurial > hg > nginx

changeset 6602:bcd442b585f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed unused flag accept_context_updated from ngx_event_t. Also, removed practically unused flag accept_context_updated from ngx_connection_t.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 29 Jun 2016 14:30:00 +0300
parents d452cb27639f
children 9eefb38f0005
files src/core/ngx_connection.h src/event/ngx_event.h src/event/ngx_event_acceptex.c
diffstat 3 files changed, 2 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -186,10 +186,6 @@ struct ngx_connection_s {
 
     unsigned            need_last_buf:1;
 
-#if (NGX_HAVE_IOCP)
-    unsigned            accept_context_updated:1;
-#endif
-
 #if (NGX_HAVE_AIO_SENDFILE)
     unsigned            busy_count:2;
 #endif
--- 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;
 
--- 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,