Mercurial > hg > nginx-quic
comparison src/http/ngx_http_upstream.c @ 1533:9b10ba85b249 stable-0.5
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 | 4699bab788c0 |
children | d5db0e96bcc6 |
comparison
equal
deleted
inserted
replaced
1532:44bd4db45b30 | 1533:9b10ba85b249 |
---|---|
3206 | 3206 |
3207 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && uscfp[i]->port) { | 3207 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && uscfp[i]->port) { |
3208 ngx_log_error(NGX_LOG_WARN, cf->log, 0, | 3208 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
3209 "upstream \"%V\" may not have port %d in %s:%ui", | 3209 "upstream \"%V\" may not have port %d in %s:%ui", |
3210 &u->host, uscfp[i]->port, | 3210 &u->host, uscfp[i]->port, |
3211 uscfp[i]->file_name.data, uscfp[i]->line); | 3211 uscfp[i]->file_name, uscfp[i]->line); |
3212 return NULL; | 3212 return NULL; |
3213 } | 3213 } |
3214 | 3214 |
3215 if (uscfp[i]->port != u->port) { | 3215 if (uscfp[i]->port != u->port) { |
3216 continue; | 3216 continue; |
3230 return NULL; | 3230 return NULL; |
3231 } | 3231 } |
3232 | 3232 |
3233 uscf->flags = flags; | 3233 uscf->flags = flags; |
3234 uscf->host = u->host; | 3234 uscf->host = u->host; |
3235 uscf->file_name = cf->conf_file->file.name; | 3235 uscf->file_name = cf->conf_file->file.name.data; |
3236 uscf->line = cf->conf_file->line; | 3236 uscf->line = cf->conf_file->line; |
3237 uscf->port = u->port; | 3237 uscf->port = u->port; |
3238 uscf->default_port = u->default_port; | 3238 uscf->default_port = u->default_port; |
3239 | 3239 |
3240 if (u->naddrs == 1) { | 3240 if (u->naddrs == 1) { |