diff options
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/ngx_http.c | 8 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.h | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_header_filter.c | 6 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_request.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 391bd1bf8..9eb023809 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -418,10 +418,10 @@ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) in_port->port = lscf[l].port; - ngx_test_null(in_port->port_name.data, ngx_palloc(cf->pool, 7), + ngx_test_null(in_port->port_text.data, ngx_palloc(cf->pool, 7), NGX_CONF_ERROR); - in_port->port_name.len = ngx_snprintf((char *) - in_port->port_name.data, + in_port->port_text.len = ngx_snprintf((char *) + in_port->port_text.data, 7, ":%d", in_port->port); @@ -549,7 +549,7 @@ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) NGX_CONF_ERROR); inport->port = in_port[p].port; - inport->port_name = in_port[p].port_name; + inport->port_text = in_port[p].port_text; /* init list of the addresses ... */ diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h index 25101aa7c..3a70f29d9 100644 --- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -79,7 +79,7 @@ typedef struct { typedef struct { in_port_t port; - ngx_str_t port_name; + ngx_str_t port_text; ngx_array_t addrs; /* array of ngx_http_in_addr_t */ } ngx_http_in_port_t; diff --git a/src/http/ngx_http_header_filter.c b/src/http/ngx_http_header_filter.c index a08c73e15..5e9a11578 100644 --- a/src/http/ngx_http_header_filter.c +++ b/src/http/ngx_http_header_filter.c @@ -206,7 +206,7 @@ static ngx_int_t ngx_http_header_filter(ngx_http_request_t *r) + r->server_name->len + r->headers_out.location->value.len + 2; if (r->port != 80) { - len += r->port_name->len; + len += r->port_text->len; } } @@ -325,8 +325,8 @@ static ngx_int_t ngx_http_header_filter(ngx_http_request_t *r) b->last = ngx_cpymem(b->last, r->server_name->data, r->server_name->len); if (r->port != 80) { - b->last = ngx_cpymem(b->last, r->port_name->data, - r->port_name->len); + b->last = ngx_cpymem(b->last, r->port_text->data, + r->port_text->len); } b->last = ngx_cpymem(b->last, r->headers_out.location->value.data, diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index a1081af12..734576783 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -202,7 +202,7 @@ static void ngx_http_init_request(ngx_event_t *rev) in_addr = in_port->addrs.elts; r->port = in_port->port; - r->port_name = &in_port->port_name; + r->port_text = &in_port->port_text; i = 0; diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index cc0cbbf5e..8055b5f1f 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -257,7 +257,7 @@ struct ngx_http_request_s { uint32_t in_addr; ngx_uint_t port; - ngx_str_t *port_name; /* ":80" */ + ngx_str_t *port_text; /* ":80" */ ngx_str_t *server_name; ngx_array_t *virtual_names; |