Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.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 | 0a269c464eaf |
children | 8596627c4cc5 |
comparison
equal
deleted
inserted
replaced
1488:0e66eabd18b5 | 1489:56f1ea5baabb |
---|---|
3221 | 3221 |
3222 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && uscfp[i]->port) { | 3222 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && uscfp[i]->port) { |
3223 ngx_log_error(NGX_LOG_WARN, cf->log, 0, | 3223 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
3224 "upstream \"%V\" may not have port %d in %s:%ui", | 3224 "upstream \"%V\" may not have port %d in %s:%ui", |
3225 &u->host, uscfp[i]->port, | 3225 &u->host, uscfp[i]->port, |
3226 uscfp[i]->file_name.data, uscfp[i]->line); | 3226 uscfp[i]->file_name, uscfp[i]->line); |
3227 return NULL; | 3227 return NULL; |
3228 } | 3228 } |
3229 | 3229 |
3230 if (uscfp[i]->port != u->port) { | 3230 if (uscfp[i]->port != u->port) { |
3231 continue; | 3231 continue; |
3245 return NULL; | 3245 return NULL; |
3246 } | 3246 } |
3247 | 3247 |
3248 uscf->flags = flags; | 3248 uscf->flags = flags; |
3249 uscf->host = u->host; | 3249 uscf->host = u->host; |
3250 uscf->file_name = cf->conf_file->file.name; | 3250 uscf->file_name = cf->conf_file->file.name.data; |
3251 uscf->line = cf->conf_file->line; | 3251 uscf->line = cf->conf_file->line; |
3252 uscf->port = u->port; | 3252 uscf->port = u->port; |
3253 uscf->default_port = u->default_port; | 3253 uscf->default_port = u->default_port; |
3254 | 3254 |
3255 if (u->naddrs == 1) { | 3255 if (u->naddrs == 1) { |