mirror of
https://github.com/nginx/nginx.git
synced 2025-06-09 10:52:47 +08:00
update variable name missed in r2513
This commit is contained in:
parent
419c736ae8
commit
fdf8e1e183
@ -18,7 +18,7 @@ static ngx_int_t ngx_http_init_phase_handlers(ngx_conf_t *cf,
|
|||||||
ngx_http_core_main_conf_t *cmcf);
|
ngx_http_core_main_conf_t *cmcf);
|
||||||
|
|
||||||
static ngx_int_t ngx_http_init_server_lists(ngx_conf_t *cf,
|
static ngx_int_t ngx_http_init_server_lists(ngx_conf_t *cf,
|
||||||
ngx_array_t *servers, ngx_array_t *in_ports);
|
ngx_array_t *servers, ngx_array_t *ports);
|
||||||
static ngx_int_t ngx_http_add_ports(ngx_conf_t *cf,
|
static ngx_int_t ngx_http_add_ports(ngx_conf_t *cf,
|
||||||
ngx_http_core_srv_conf_t *cscf, ngx_array_t *ports,
|
ngx_http_core_srv_conf_t *cscf, ngx_array_t *ports,
|
||||||
ngx_http_listen_t *listen);
|
ngx_http_listen_t *listen);
|
||||||
@ -122,7 +122,7 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
char *rv;
|
char *rv;
|
||||||
ngx_uint_t mi, m, s;
|
ngx_uint_t mi, m, s;
|
||||||
ngx_conf_t pcf;
|
ngx_conf_t pcf;
|
||||||
ngx_array_t in_ports;
|
ngx_array_t ports;
|
||||||
ngx_http_module_t *module;
|
ngx_http_module_t *module;
|
||||||
ngx_http_conf_ctx_t *ctx;
|
ngx_http_conf_ctx_t *ctx;
|
||||||
ngx_http_core_loc_conf_t *clcf;
|
ngx_http_core_loc_conf_t *clcf;
|
||||||
@ -367,14 +367,14 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
* to find quickly the server core module configuration at run-time
|
* to find quickly the server core module configuration at run-time
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (ngx_http_init_server_lists(cf, &cmcf->servers, &in_ports) != NGX_OK) {
|
if (ngx_http_init_server_lists(cf, &cmcf->servers, &ports) != NGX_OK) {
|
||||||
return NGX_CONF_ERROR;
|
return NGX_CONF_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* optimize the lists of ports, addresses and server names */
|
/* optimize the lists of ports, addresses and server names */
|
||||||
|
|
||||||
if (ngx_http_optimize_servers(cf, cmcf, &in_ports) != NGX_OK) {
|
if (ngx_http_optimize_servers(cf, cmcf, &ports) != NGX_OK) {
|
||||||
return NGX_CONF_ERROR;
|
return NGX_CONF_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user