Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

style fix

Browse source
This commit is contained in:
Igor Sysoev 2009-05-14 16:24:39 +00:00
parent f8411dbc86
commit b341110460
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/ngx_conf_file.c
View file

@ -446,7 +446,9 @@ ngx_conf_read_token(ngx_conf_t *cf)
last_space = 1; last_space = 1;
sharp_comment = 0; sharp_comment = 0;
variable = 0; variable = 0;
quoted = s_quoted = d_quoted = 0; quoted = 0;
s_quoted = 0;
d_quoted = 0;
cf->args->nelts = 0; cf->args->nelts = 0;
b = cf->conf_file->buffer; b = cf->conf_file->buffer;

6
src/event/modules/ngx_aio_module.c
View file

@ -134,12 +134,14 @@ ngx_aio_del_connection(ngx_connection_t *c, ngx_uint_t flags)
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_cancel: %d", rc); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_cancel: %d", rc);
if (rc == AIO_CANCELED) { if (rc == AIO_CANCELED) {
c->read->active = c->write->active = 0; c->read->active = 0;
c->write->active = 0;
return NGX_OK; return NGX_OK;
} }
if (rc == AIO_ALLDONE) { 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, ngx_log_error(NGX_LOG_ALERT, c->log, 0,
"aio_cancel() returned AIO_ALLDONE"); "aio_cancel() returned AIO_ALLDONE");
return NGX_OK; return NGX_OK;

4
src/http/ngx_http_upstream.c
View file

@ -972,7 +972,9 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
u->output.sendfile = c->sendfile; u->output.sendfile = c->sendfile;
c->pool = r->pool; 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 */ /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */