r1490 merge:

u_char* is enough to keep file name

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 6c5acd94dd7d94953351825fec576f5c18e57d54..51667d13822bc889f7a1020498fb8f4f0fe7ddc0 100644 (file)
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -551,8 +551,8 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
                         if (in_addr[a].default_server) {
                             ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                                        "the duplicate default server in %V:%d",
-                                        &lscf[l].file_name, lscf[l].line);
+                                      "the duplicate default server in %s:%ui",
+                                       &lscf[l].file_name, lscf[l].line);
 
                             return NGX_CONF_ERROR;
                         }

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c7fa92cebaafabd70696149fd91ffeef9470b151..347cf01b73b6461a92f4692b2add5614fb2f2744 100644 (file)
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2595,7 +2595,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ls->family = AF_INET;
     ls->addr = u.addr.in_addr;
     ls->port = u.port;
-    ls->file_name = cf->conf_file->file.name;
+    ls->file_name = cf->conf_file->file.name.data;
     ls->line = cf->conf_file->line;
     ls->conf.backlog = NGX_LISTEN_BACKLOG;
     ls->conf.rcvbuf = -1;

diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 5e9b48327c631a2aa738718a0abc20688041b96a..2ddbd7573ed179d0dfeed0c069276f9b0b59af53 100644 (file)
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -38,8 +38,8 @@ typedef struct {
     in_port_t                  port;
     int                        family;
 
-    ngx_str_t                  file_name;
-    ngx_int_t                  line;
+    u_char                    *file_name;
+    ngx_uint_t                 line;
 
     ngx_http_listen_conf_t     conf;
 } ngx_http_listen_t;

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 919dc5903450a8cf0eb6c2101d7bee186734eec6..a662e353a2d622469f49e97293a35035cd821fff 100644 (file)
--- 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;

diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index b3bb1b4fdb3ac4c8804f7aefde118f77446744d8..010a10c7cc35f8fdcdef1263d14d9993dae62844 100644 (file)
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -91,7 +91,7 @@ struct ngx_http_upstream_srv_conf_s {
 
     ngx_uint_t                      flags;
     ngx_str_t                       host;
-    ngx_str_t                       file_name;
+    u_char                         *file_name;
     ngx_uint_t                      line;
     in_port_t                       port;
     in_port_t                       default_port;

diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 068dfc279231b388a471d11cabf57d153e13d560..36917a0b218b2431965255ddbc3451f87f39c9d9 100644 (file)
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -64,7 +64,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
     if (us->port == 0 && us->default_port == 0) {
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                       "no port in upstream \"%V\" in %s:%ui",
-                      &us->host, us->file_name.data, us->line);
+                      &us->host, us->file_name, us->line);
         return NGX_ERROR;
     }
 
@@ -77,7 +77,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
         if (u.err) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "%s in upstream \"%V\" in %s:%ui",
-                          u.err, &us->host, us->file_name.data, us->line);
+                          u.err, &us->host, us->file_name, us->line);
         }
 
         return NGX_ERROR;