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

r1559, r1565 merge: 

optimizations
This commit is contained in:
Igor Sysoev 2007-12-12 16:49:38 +00:00
parent 9a95869ac4
commit 919798169d
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/http/ngx_http_upstream.c
View File

@ -978,8 +978,7 @@ ngx_http_upstream_process_header(ngx_event_t *rev)
#endif
}
n = u->peer.connection->recv(u->peer.connection, u->buffer.last,
u->buffer.end - u->buffer.last);
n = c->recv(c, u->buffer.last, u->buffer.end - u->buffer.last);
if (n == NGX_AGAIN) {
#if 0

17
src/http/ngx_http_upstream_round_robin.c
View File

@ -94,17 +94,14 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
peers->number = n;
peers->name = &us->host;
n = 0;
for (i = 0; i < u.naddrs; i++) {
peers->peer[n].sockaddr = u.addrs[i].sockaddr;
peers->peer[n].socklen = u.addrs[i].socklen;
peers->peer[n].name = u.addrs[i].name;
peers->peer[n].weight = 1;
peers->peer[n].current_weight = 1;
peers->peer[n].max_fails = 1;
peers->peer[n].fail_timeout = 10;
n++;
peers->peer[i].sockaddr = u.addrs[i].sockaddr;
peers->peer[i].socklen = u.addrs[i].socklen;
peers->peer[i].name = u.addrs[i].name;
peers->peer[i].weight = 1;
peers->peer[i].current_weight = 1;
peers->peer[i].max_fails = 1;
peers->peer[i].fail_timeout = 10;
}
us->peer.data = peers;