Mercurial > hg > nginx

diff src/http/ngx_http_upstream.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 4699bab788c0
children d5db0e96bcc6
line wrap: on
line diff
--- 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, ng
             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, ng
 
     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;