Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 6789:4dea01cf49e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: removed ngx_http_upstream_srv_conf_t.default_port. This is an API change.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 17 Oct 2016 14:30:54 +0300
parents 3fa5983b6b44
children 0fba3ed4e7eb
comparison
equal deleted inserted replaced
6788:3fa5983b6b44 6789:4dea01cf49e8
5761 } 5761 }
5762 5762
5763 if (flags & NGX_HTTP_UPSTREAM_CREATE) { 5763 if (flags & NGX_HTTP_UPSTREAM_CREATE) {
5764 uscfp[i]->flags = flags; 5764 uscfp[i]->flags = flags;
5765 uscfp[i]->port = 0; 5765 uscfp[i]->port = 0;
5766 uscfp[i]->default_port = 0;
5767 } 5766 }
5768 5767
5769 return uscfp[i]; 5768 return uscfp[i];
5770 } 5769 }
5771 5770
5777 uscf->flags = flags; 5776 uscf->flags = flags;
5778 uscf->host = u->host; 5777 uscf->host = u->host;
5779 uscf->file_name = cf->conf_file->file.name.data; 5778 uscf->file_name = cf->conf_file->file.name.data;
5780 uscf->line = cf->conf_file->line; 5779 uscf->line = cf->conf_file->line;
5781 uscf->port = u->port; 5780 uscf->port = u->port;
5782 uscf->default_port = u->default_port;
5783 uscf->no_port = u->no_port; 5781 uscf->no_port = u->no_port;
5784 5782
5785 if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) { 5783 if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) {
5786 uscf->servers = ngx_array_create(cf->pool, 1, 5784 uscf->servers = ngx_array_create(cf->pool, 1,
5787 sizeof(ngx_http_upstream_server_t)); 5785 sizeof(ngx_http_upstream_server_t));