]> git.kaiwu.me - nginx.git/commitdiff
Upstream: removed ngx_http_upstream_srv_conf_t.default_port.
authorRuslan Ermilov <ru@nginx.com>
Mon, 17 Oct 2016 11:30:54 +0000 (14:30 +0300)
committerRuslan Ermilov <ru@nginx.com>
Mon, 17 Oct 2016 11:30:54 +0000 (14:30 +0300)
This is an API change.

src/http/ngx_http_upstream.c
src/http/ngx_http_upstream.h

index 6e5cab8ed8b89cd40347afe4d14659afe2055dc7..addd8075d854d6d05d5fc7e97458bc63515fddf5 100644 (file)
@@ -5763,7 +5763,6 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
         if (flags & NGX_HTTP_UPSTREAM_CREATE) {
             uscfp[i]->flags = flags;
             uscfp[i]->port = 0;
-            uscfp[i]->default_port = 0;
         }
 
         return uscfp[i];
@@ -5779,7 +5778,6 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
     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;
     uscf->no_port = u->no_port;
 
     if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) {
index 426672071a1be5194eef4e0567105d124da48530..23d4726a16816fdbba76b0b10243ad45a60533cb 100644 (file)
@@ -128,7 +128,6 @@ struct ngx_http_upstream_srv_conf_s {
     u_char                          *file_name;
     ngx_uint_t                       line;
     in_port_t                        port;
-    in_port_t                        default_port;
     ngx_uint_t                       no_port;  /* unsigned no_port:1 */
 
 #if (NGX_HTTP_UPSTREAM_ZONE)