Mercurial > hg > nginx
comparison src/http/ngx_http_upstream_round_robin.c @ 1489:56f1ea5baabb
u_char* is enough to keep file name
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 15 Sep 2007 17:11:06 +0000 |
parents | a9132739bb57 |
children | 9ea31a2eab27 |
comparison
equal
deleted
inserted
replaced
1488:0e66eabd18b5 | 1489:56f1ea5baabb |
---|---|
134 /* an upstream implicitly defined by proxy_pass, etc. */ | 134 /* an upstream implicitly defined by proxy_pass, etc. */ |
135 | 135 |
136 if (us->port == 0 && us->default_port == 0) { | 136 if (us->port == 0 && us->default_port == 0) { |
137 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | 137 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
138 "no port in upstream \"%V\" in %s:%ui", | 138 "no port in upstream \"%V\" in %s:%ui", |
139 &us->host, us->file_name.data, us->line); | 139 &us->host, us->file_name, us->line); |
140 return NGX_ERROR; | 140 return NGX_ERROR; |
141 } | 141 } |
142 | 142 |
143 ngx_memzero(&u, sizeof(ngx_url_t)); | 143 ngx_memzero(&u, sizeof(ngx_url_t)); |
144 | 144 |
147 | 147 |
148 if (ngx_inet_resolve_host(cf, &u) != NGX_OK) { | 148 if (ngx_inet_resolve_host(cf, &u) != NGX_OK) { |
149 if (u.err) { | 149 if (u.err) { |
150 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | 150 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
151 "%s in upstream \"%V\" in %s:%ui", | 151 "%s in upstream \"%V\" in %s:%ui", |
152 u.err, &us->host, us->file_name.data, us->line); | 152 u.err, &us->host, us->file_name, us->line); |
153 } | 153 } |
154 | 154 |
155 return NGX_ERROR; | 155 return NGX_ERROR; |
156 } | 156 } |
157 | 157 |