From: Ruslan Ermilov <ru@nginx.com>
Date: Mon, 17 Oct 2016 11:30:54 +0000 (+0300)
Subject: Upstream: removed ngx_http_upstream_srv_conf_t.default_port.
X-Git-Tag: release-1.11.6~12
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d970e099c6b0303395f89e0556f2812bd1d87cf0;p=nginx.git

Upstream: removed ngx_http_upstream_srv_conf_t.default_port.

This is an API change.
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 6e5cab8ed..addd8075d 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -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)) {
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 426672071..23d4726a1 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -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)