comparison src/stream/ngx_stream_upstream.h @ 6785:d1d0dd69a419

Upstream: added the ngx_http_upstream_resolved_t.name field. This fixes inconsistency in what is stored in the "host" field. Normally it would contain the "host" part of the parsed URL (e.g., proxy_pass with variables), but for the case of an implicit upstream specified with literal address it contained the text representation of the socket address (that is, host including port for IP). Now the "host" field always contains the "host" part of the URL, while the text representation of the socket address is stored in the newly added "name" field. The ngx_http_upstream_create_round_robin_peer() function was modified accordingly in a way to be compatible with the code that does not know about the new "name" field. The "stream" code was similarly modified except for not adding compatibility in ngx_stream_upstream_create_round_robin_peer(). This change is also a prerequisite for the next change.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 31 Oct 2016 18:33:33 +0300
parents f41c2530dd17
children 54cf51c4f07a
comparison
equal deleted inserted replaced
6784:1af120241cde 6785:d1d0dd69a419
103 ngx_uint_t naddrs; 103 ngx_uint_t naddrs;
104 ngx_resolver_addr_t *addrs; 104 ngx_resolver_addr_t *addrs;
105 105
106 struct sockaddr *sockaddr; 106 struct sockaddr *sockaddr;
107 socklen_t socklen; 107 socklen_t socklen;
108 ngx_str_t name;
108 109
109 ngx_resolver_ctx_t *ctx; 110 ngx_resolver_ctx_t *ctx;
110 } ngx_stream_upstream_resolved_t; 111 } ngx_stream_upstream_resolved_t;
111 112
112 113