mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
rename variable
This commit is contained in:
parent
ef3e5bd892
commit
183f71ee9d
@ -21,7 +21,7 @@ static void ngx_close_accepted_connection(ngx_connection_t *c);
|
|||||||
void
|
void
|
||||||
ngx_event_accept(ngx_event_t *ev)
|
ngx_event_accept(ngx_event_t *ev)
|
||||||
{
|
{
|
||||||
socklen_t sl;
|
socklen_t socklen;
|
||||||
ngx_err_t err;
|
ngx_err_t err;
|
||||||
ngx_log_t *log;
|
ngx_log_t *log;
|
||||||
ngx_socket_t s;
|
ngx_socket_t s;
|
||||||
@ -48,9 +48,9 @@ ngx_event_accept(ngx_event_t *ev)
|
|||||||
"accept on %V, ready: %d", &ls->addr_text, ev->available);
|
"accept on %V, ready: %d", &ls->addr_text, ev->available);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
sl = NGX_SOCKLEN;
|
socklen = NGX_SOCKLEN;
|
||||||
|
|
||||||
s = accept(lc->fd, (struct sockaddr *) sa, &sl);
|
s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
|
||||||
|
|
||||||
if (s == -1) {
|
if (s == -1) {
|
||||||
err = ngx_socket_errno;
|
err = ngx_socket_errno;
|
||||||
@ -104,13 +104,13 @@ ngx_event_accept(ngx_event_t *ev)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
c->sockaddr = ngx_palloc(c->pool, sl);
|
c->sockaddr = ngx_palloc(c->pool, socklen);
|
||||||
if (c->sockaddr == NULL) {
|
if (c->sockaddr == NULL) {
|
||||||
ngx_close_accepted_connection(c);
|
ngx_close_accepted_connection(c);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_memcpy(c->sockaddr, sa, sl);
|
ngx_memcpy(c->sockaddr, sa, socklen);
|
||||||
|
|
||||||
log = ngx_palloc(c->pool, sizeof(ngx_log_t));
|
log = ngx_palloc(c->pool, sizeof(ngx_log_t));
|
||||||
if (log == NULL) {
|
if (log == NULL) {
|
||||||
@ -152,7 +152,7 @@ ngx_event_accept(ngx_event_t *ev)
|
|||||||
c->pool->log = log;
|
c->pool->log = log;
|
||||||
|
|
||||||
c->listening = ls;
|
c->listening = ls;
|
||||||
c->socklen = sl;
|
c->socklen = socklen;
|
||||||
|
|
||||||
c->unexpected_eof = 1;
|
c->unexpected_eof = 1;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user