Mercurial > hg > nginx

comparison src/http/ngx_http_upstream_round_robin.c @ 1533:9b10ba85b249 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1490 merge: u_char* is enough to keep file name
author Igor Sysoev <igor@sysoev.ru>
date Sun, 23 Sep 2007 19:29:22 +0000
parents 5f79db696606
children a179755ee1ea
comparison
equal deleted inserted replaced
1532:44bd4db45b30 1533:9b10ba85b249
62 /* an upstream implicitly defined by proxy_pass, etc. */ 62 /* an upstream implicitly defined by proxy_pass, etc. */
63 63
64 if (us->port == 0 && us->default_port == 0) { 64 if (us->port == 0 && us->default_port == 0) {
65 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 65 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
66 "no port in upstream \"%V\" in %s:%ui", 66 "no port in upstream \"%V\" in %s:%ui",
67 &us->host, us->file_name.data, us->line); 67 &us->host, us->file_name, us->line);
68 return NGX_ERROR; 68 return NGX_ERROR;
69 } 69 }
70 70
71 ngx_memzero(&u, sizeof(ngx_url_t)); 71 ngx_memzero(&u, sizeof(ngx_url_t));
72 72
75 75
76 if (ngx_inet_resolve_host(cf, &u) != NGX_OK) { 76 if (ngx_inet_resolve_host(cf, &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.data, us->line); 80 u.err, &us->host, us->file_name, us->line);
81 } 81 }
82 82
83 return NGX_ERROR; 83 return NGX_ERROR;
84 } 84 }
85 85