Mercurial > hg > nginx
comparison src/http/ngx_http_upstream_round_robin.c @ 1710:20a0f2880d45 stable-0.5
r1560 merge:
use pool instead of ngx_conf_t
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 12 Dec 2007 16:51:43 +0000 |
| parents | a179755ee1ea |
| children |
comparison
equal
deleted
inserted
replaced
| 1709:a179755ee1ea | 1710:20a0f2880d45 |
|---|---|
| 71 ngx_memzero(&u, sizeof(ngx_url_t)); | 71 ngx_memzero(&u, sizeof(ngx_url_t)); |
| 72 | 72 |
| 73 u.host = us->host; | 73 u.host = us->host; |
| 74 u.port = (in_port_t) (us->port ? us->port : us->default_port); | 74 u.port = (in_port_t) (us->port ? us->port : us->default_port); |
| 75 | 75 |
| 76 if (ngx_inet_resolve_host(cf, &u) != NGX_OK) { | 76 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { |
| 77 if (u.err) { | 77 if (u.err) { |
| 78 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | 78 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
| 79 "%s in upstream \"%V\" in %s:%ui", | 79 "%s in upstream \"%V\" in %s:%ui", |
| 80 u.err, &us->host, us->file_name, us->line); | 80 u.err, &us->host, us->file_name, us->line); |
| 81 } | 81 } |