Mercurial > hg > nginx
changeset 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 | 44bd4db45b30 |
| children | 13d5d23a5344 |
| files | src/http/ngx_http.c src/http/ngx_http_core_module.c src/http/ngx_http_core_module.h src/http/ngx_http_upstream.c src/http/ngx_http_upstream.h src/http/ngx_http_upstream_round_robin.c |
| diffstat | 6 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -551,8 +551,8 @@ ngx_http_block(ngx_conf_t *cf, ngx_comma 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; }
--- 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 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;
--- 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;
--- 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;
--- 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;
--- 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_c 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_c 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;