Mercurial > hg > nginx
changeset 1671:8075179cae21
ngx_parse_url() saves port text, this allows to use it in proxy host header
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 28 Nov 2007 19:55:31 +0000 |
parents | ab6a0d0cf68b |
children | bc93d5ab3e27 |
files | src/core/ngx_inet.c src/core/ngx_inet.h src/http/modules/ngx_http_proxy_module.c |
diffstat | 3 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -417,6 +417,9 @@ ngx_parse_url(ngx_pool_t *pool, ngx_url_ return NGX_ERROR; } + u->port_text.len = port_len; + u->port_text.data = port_start; + } else { port = ngx_atoi(p, len);
--- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h @@ -35,6 +35,7 @@ typedef struct { ngx_str_t url; ngx_str_t host; + ngx_str_t port_text; ngx_str_t uri; in_port_t port;
--- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -2645,8 +2645,6 @@ static ngx_int_t ngx_http_proxy_set_vars(ngx_pool_t *pool, ngx_url_t *u, ngx_http_proxy_vars_t *v) { - u_char *p; - if (!u->unix_socket) { if (u->no_port || u->port == u->default_port) { v->host_header = u->host; @@ -2661,16 +2659,9 @@ ngx_http_proxy_set_vars(ngx_pool_t *pool } } else { - p = ngx_palloc(pool, u->host.len + sizeof(":65536") - 1); - if (p == NULL) { - return NGX_ERROR; - } - - v->host_header.len = ngx_sprintf(p, "%V:%d", &u->host, u->port) - p; - v->host_header.data = p; - - v->port.len = v->host_header.len - u->host.len - 1; - v->port.data = p + u->host.len + 1; + v->host_header.len = u->host.len + 1 + u->port_text.len; + v->host_header.data = u->host.data; + v->port = u->port_text; } } else {