Mercurial > hg > nginx-quic
changeset 2847:3e10674139e4
style fix
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 14 May 2009 16:24:39 +0000 |
parents | dfec0e090265 |
children | 0d8941f2b0ee |
files | src/core/ngx_conf_file.c src/event/modules/ngx_aio_module.c src/http/ngx_http_upstream.c |
diffstat | 3 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -446,7 +446,9 @@ ngx_conf_read_token(ngx_conf_t *cf) last_space = 1; sharp_comment = 0; variable = 0; - quoted = s_quoted = d_quoted = 0; + quoted = 0; + s_quoted = 0; + d_quoted = 0; cf->args->nelts = 0; b = cf->conf_file->buffer;
--- a/src/event/modules/ngx_aio_module.c +++ b/src/event/modules/ngx_aio_module.c @@ -134,12 +134,14 @@ ngx_aio_del_connection(ngx_connection_t ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_cancel: %d", rc); if (rc == AIO_CANCELED) { - c->read->active = c->write->active = 0; + c->read->active = 0; + c->write->active = 0; return NGX_OK; } if (rc == AIO_ALLDONE) { - c->read->active = c->write->active = 0; + c->read->active = 0; + c->write->active = 0; ngx_log_error(NGX_LOG_ALERT, c->log, 0, "aio_cancel() returned AIO_ALLDONE"); return NGX_OK;
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -972,7 +972,9 @@ ngx_http_upstream_connect(ngx_http_reque u->output.sendfile = c->sendfile; c->pool = r->pool; - c->read->log = c->write->log = c->log = r->connection->log; + c->log = r->connection->log; + c->read->log = c->log; + c->write->log = c->log; /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */