Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 6594:3c87b82b17d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: support for port in proxy_bind and friends.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 20 Jun 2016 11:50:43 +0300
parents f7849bfb6d21
children c131f20c9562
comparison
equal deleted inserted replaced
6593:b3b7e33083ac 6594:3c87b82b17d4
5826 local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t)); 5826 local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
5827 if (local->addr == NULL) { 5827 if (local->addr == NULL) {
5828 return NGX_CONF_ERROR; 5828 return NGX_CONF_ERROR;
5829 } 5829 }
5830 5830
5831 rc = ngx_parse_addr(cf->pool, local->addr, value[1].data, value[1].len); 5831 rc = ngx_parse_addr_port(cf->pool, local->addr, value[1].data,
5832 value[1].len);
5832 5833
5833 switch (rc) { 5834 switch (rc) {
5834 case NGX_OK: 5835 case NGX_OK:
5835 local->addr->name = value[1]; 5836 local->addr->name = value[1];
5836 break; 5837 break;
5898 addr = ngx_palloc(r->pool, sizeof(ngx_addr_t)); 5899 addr = ngx_palloc(r->pool, sizeof(ngx_addr_t));
5899 if (addr == NULL) { 5900 if (addr == NULL) {
5900 return NGX_ERROR; 5901 return NGX_ERROR;
5901 } 5902 }
5902 5903
5903 rc = ngx_parse_addr(r->pool, addr, val.data, val.len); 5904 rc = ngx_parse_addr_port(r->pool, addr, val.data, val.len);
5904 if (rc == NGX_ERROR) { 5905 if (rc == NGX_ERROR) {
5905 return NGX_ERROR; 5906 return NGX_ERROR;
5906 } 5907 }
5907 5908
5908 if (rc != NGX_OK) { 5909 if (rc != NGX_OK) {