ngx_parse_url() saves port text, this allows to use it in proxy host header

diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index d7a3cd1faabff53282397be7e90c22056ffb4f3b..702d6453a1d1d6d794d24e47892334a8e246f9bb 100644 (file)
--- 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_t *u)
             return NGX_ERROR;
         }
 
+        u->port_text.len = port_len;
+        u->port_text.data = port_start;
+
     } else {
         port = ngx_atoi(p, len);
 

diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
index b2444b98ca292bb83bead9a1a931fd9d326097e8..509f80ab6b5d272a302b20dc536966e4fa03df98 100644 (file)
--- 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;

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 69a12e0fc8b94a8ca56b793dd1fb81e61f8c98e6..977de4641344ca92824edb34bdabd396d476c24c 100644 (file)
--- 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, ngx_url_t *u,
             }
 
         } 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 {