mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-05 06:19:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: prepared proxy_bind to accept parameters.

Browse Source 
In addition, errors occurred while setting bind address are no longer ignored.
This commit is contained in:
Roman Arutyunyan 2016-04-13 15:42:46 +03:00
parent 438b58f91f
commit f10bc5a763
1 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/http/ngx_http_upstream.c
View File

@ -165,8 +165,8 @@ static char *ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy);
static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
static ngx_addr_t *ngx_http_upstream_get_local(ngx_http_request_t *r, static ngx_int_t ngx_http_upstream_set_local(ngx_http_request_t *r,
ngx_http_upstream_local_t *local); ngx_http_upstream_t *u, ngx_http_upstream_local_t *local);
static void *ngx_http_upstream_create_main_conf(ngx_conf_t *cf); static void *ngx_http_upstream_create_main_conf(ngx_conf_t *cf);
static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf); static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf);
@ -588,7 +588,10 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
return; return;
} }
u->peer.local = ngx_http_upstream_get_local(r, u->conf->local); if (ngx_http_upstream_set_local(r, u, u->conf->local) != NGX_OK) {
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
}
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
@ -5815,9 +5818,7 @@ ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
*local->value = cv; *local->value = cv;
return NGX_CONF_OK; } else {
}
local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t)); local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
if (local->addr == NULL) { if (local->addr == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -5828,7 +5829,7 @@ ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
switch (rc) { switch (rc) {
case NGX_OK: case NGX_OK:
local->addr->name = value[1]; local->addr->name = value[1];
return NGX_CONF_OK; break;
case NGX_DECLINED: case NGX_DECLINED:
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@ -5838,11 +5839,14 @@ ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
default: default:
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
}
return NGX_CONF_OK;
} }
static ngx_addr_t * static ngx_int_t
ngx_http_upstream_get_local(ngx_http_request_t *r, ngx_http_upstream_set_local(ngx_http_request_t *r, ngx_http_upstream_t *u,
ngx_http_upstream_local_t *local) ngx_http_upstream_local_t *local)
{ {
ngx_int_t rc; ngx_int_t rc;
@ -5850,41 +5854,43 @@ ngx_http_upstream_get_local(ngx_http_request_t *r,
ngx_addr_t *addr; ngx_addr_t *addr;
if (local == NULL) { if (local == NULL) {
return NULL; u->peer.local = NULL;
return NGX_OK;
} }
if (local->value == NULL) { if (local->value == NULL) {
return local->addr; u->peer.local = local->addr;
return NGX_OK;
} }
if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) { if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) {
return NULL; return NGX_ERROR;
} }
if (val.len == 0) { if (val.len == 0) {
return NULL; return NGX_OK;
} }
addr = ngx_palloc(r->pool, sizeof(ngx_addr_t)); addr = ngx_palloc(r->pool, sizeof(ngx_addr_t));
if (addr == NULL) { if (addr == NULL) {
return NULL; return NGX_ERROR;
} }
rc = ngx_parse_addr(r->pool, addr, val.data, val.len); rc = ngx_parse_addr(r->pool, addr, val.data, val.len);
if (rc == NGX_ERROR) {
return NGX_ERROR;
}
switch (rc) { if (rc != NGX_OK) {
case NGX_OK:
addr->name = val;
return addr;
case NGX_DECLINED:
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"invalid local address \"%V\"", &val); "invalid local address \"%V\"", &val);
/* fall through */ return NGX_OK;
default:
return NULL;
} }
addr->name = val;
u->peer.local = addr;
return NGX_OK;
} }