diff options
author | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 19:49:38 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 19:49:38 +0300 |
commit | 71704b27c9eea7810f1d5158240b4d464629abe1 (patch) | |
tree | e641854dab784abc21b6002fa0068adde914e06f | |
parent | 53032036da52eec4c944b2a4fb24865e0c1ac44c (diff) |
r1559, r1565 merge:
optimizations
-rw-r--r-- | src/http/ngx_http_upstream.c | 3 | ||||
-rw-r--r-- | src/http/ngx_http_upstream_round_robin.c | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 47ac77062..baa6f0731 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -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 diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c index 36917a0b2..396917aa8 100644 --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -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; |