Mercurial > hg > nginx-quic
comparison src/http/ngx_http.c @ 2851:d791586bb149
update variable name missed in r2513
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 17 May 2009 19:58:37 +0000 |
parents | a445bd4eb571 |
children | dfe04af9d30b |
comparison
equal
deleted
inserted
replaced
2850:4e05bd832e56 | 2851:d791586bb149 |
---|---|
16 ngx_http_core_main_conf_t *cmcf); | 16 ngx_http_core_main_conf_t *cmcf); |
17 static ngx_int_t ngx_http_init_phase_handlers(ngx_conf_t *cf, | 17 static ngx_int_t ngx_http_init_phase_handlers(ngx_conf_t *cf, |
18 ngx_http_core_main_conf_t *cmcf); | 18 ngx_http_core_main_conf_t *cmcf); |
19 | 19 |
20 static ngx_int_t ngx_http_init_server_lists(ngx_conf_t *cf, | 20 static ngx_int_t ngx_http_init_server_lists(ngx_conf_t *cf, |
21 ngx_array_t *servers, ngx_array_t *in_ports); | 21 ngx_array_t *servers, ngx_array_t *ports); |
22 static ngx_int_t ngx_http_add_ports(ngx_conf_t *cf, | 22 static ngx_int_t ngx_http_add_ports(ngx_conf_t *cf, |
23 ngx_http_core_srv_conf_t *cscf, ngx_array_t *ports, | 23 ngx_http_core_srv_conf_t *cscf, ngx_array_t *ports, |
24 ngx_http_listen_t *listen); | 24 ngx_http_listen_t *listen); |
25 static ngx_int_t ngx_http_add_addresses(ngx_conf_t *cf, | 25 static ngx_int_t ngx_http_add_addresses(ngx_conf_t *cf, |
26 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_port_t *port, | 26 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_port_t *port, |
120 ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | 120 ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
121 { | 121 { |
122 char *rv; | 122 char *rv; |
123 ngx_uint_t mi, m, s; | 123 ngx_uint_t mi, m, s; |
124 ngx_conf_t pcf; | 124 ngx_conf_t pcf; |
125 ngx_array_t in_ports; | 125 ngx_array_t ports; |
126 ngx_http_module_t *module; | 126 ngx_http_module_t *module; |
127 ngx_http_conf_ctx_t *ctx; | 127 ngx_http_conf_ctx_t *ctx; |
128 ngx_http_core_loc_conf_t *clcf; | 128 ngx_http_core_loc_conf_t *clcf; |
129 ngx_http_core_srv_conf_t **cscfp; | 129 ngx_http_core_srv_conf_t **cscfp; |
130 ngx_http_core_main_conf_t *cmcf; | 130 ngx_http_core_main_conf_t *cmcf; |
365 /* | 365 /* |
366 * create the lists of ports, addresses and server names | 366 * create the lists of ports, addresses and server names |
367 * to find quickly the server core module configuration at run-time | 367 * to find quickly the server core module configuration at run-time |
368 */ | 368 */ |
369 | 369 |
370 if (ngx_http_init_server_lists(cf, &cmcf->servers, &in_ports) != NGX_OK) { | 370 if (ngx_http_init_server_lists(cf, &cmcf->servers, &ports) != NGX_OK) { |
371 return NGX_CONF_ERROR; | 371 return NGX_CONF_ERROR; |
372 } | 372 } |
373 | 373 |
374 | 374 |
375 /* optimize the lists of ports, addresses and server names */ | 375 /* optimize the lists of ports, addresses and server names */ |
376 | 376 |
377 if (ngx_http_optimize_servers(cf, cmcf, &in_ports) != NGX_OK) { | 377 if (ngx_http_optimize_servers(cf, cmcf, &ports) != NGX_OK) { |
378 return NGX_CONF_ERROR; | 378 return NGX_CONF_ERROR; |
379 } | 379 } |
380 | 380 |
381 return NGX_CONF_OK; | 381 return NGX_CONF_OK; |
382 | 382 |