delete unused field c->local_socklen

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 6056c3f408bc73e7f9d72059c84d807f71984425..9d064c5ace00696bc2187a6d8d887199368a40c6 100644 (file)
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -894,7 +894,6 @@ ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
             return NGX_ERROR;
         }
 
-        c->local_socklen = len;
         ngx_memcpy(c->local_sockaddr, &sa, len);
     }
 

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index ebc0c4c14a00ec5c6e3878edec1ba6f02e04fcca..1810daca0fe171269fdfaa26d1af0d78f85a1a95 100644 (file)
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -129,7 +129,6 @@ struct ngx_connection_s {
 #endif
 
     struct sockaddr    *local_sockaddr;
-    socklen_t           local_socklen;
 
     ngx_buf_t          *buffer;
 

diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 2bdccd9d39a54e2fe5eb730884dc461fdda87200..ed5762e18dbbaf0830b528d4ac682a043e509606 100644 (file)
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -152,7 +152,6 @@ ngx_event_accept(ngx_event_t *ev)
         c->socklen = socklen;
         c->listening = ls;
         c->local_sockaddr = ls->sockaddr;
-        c->local_socklen = ls->socklen;
 
         c->unexpected_eof = 1;
 

diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c
index c4b92e0ab994d9d12a73b1b9d5ae475d1de4e7b2..4e9db1ee071261b8a0ceb32bbac9de61fe573a19 100644 (file)
--- a/src/event/ngx_event_acceptex.c
+++ b/src/event/ngx_event_acceptex.c
@@ -17,6 +17,7 @@ ngx_event_acceptex(ngx_event_t *rev)
 {
     ngx_listening_t   *ls;
     ngx_connection_t  *c;
+    socklen_t          len;
 
     c = rev->data;
     ls = c->listening;
@@ -48,7 +49,7 @@ ngx_event_acceptex(ngx_event_t *rev)
                              ls->post_accept_buffer_size,
                              ls->socklen + 16,
                              ls->socklen + 16,
-                             &c->local_sockaddr, &c->local_socklen,
+                             &c->local_sockaddr, &len,
                              &c->sockaddr, &c->socklen);
 
     if (ls->post_accept_buffer_size) {