diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-09-23 19:29:22 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-09-23 19:29:22 +0000 |
| commit | 39a3f35b3d682538ce6dbd70f417e43e4d5f6156 (patch) | |
| tree | 386588a27aaeb2d2a0bd21e605560b5a79439929 /src/http/ngx_http_upstream.c | |
| parent | d0a42bbb58223e164abe75c662bc2ba7f7720334 (diff) | |
| download | nginx-39a3f35b3d682538ce6dbd70f417e43e4d5f6156.tar.gz nginx-39a3f35b3d682538ce6dbd70f417e43e4d5f6156.tar.bz2 | |
r1490 merge:
u_char* is enough to keep file name
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 919dc5903..a662e353a 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -3208,7 +3208,7 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags) ngx_log_error(NGX_LOG_WARN, cf->log, 0, "upstream \"%V\" may not have port %d in %s:%ui", &u->host, uscfp[i]->port, - uscfp[i]->file_name.data, uscfp[i]->line); + uscfp[i]->file_name, uscfp[i]->line); return NULL; } @@ -3232,7 +3232,7 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags) uscf->flags = flags; uscf->host = u->host; - uscf->file_name = cf->conf_file->file.name; + uscf->file_name = cf->conf_file->file.name.data; uscf->line = cf->conf_file->line; uscf->port = u->port; uscf->default_port = u->default_port; |