Mercurial > hg > nginx
annotate src/http/ngx_http.c @ 3257:8bd88de8fecd
fix segfault if http {} block is empty, the bug had been introduced in r3218
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 28 Oct 2009 10:45:40 +0000 |
| parents | a7491af45540 |
| children | 77db9440d970 |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
423
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
423
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
423
diff
changeset
|
4 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
423
diff
changeset
|
5 |
|
2
ffffe1499bce
nginx-0.0.1-2002-08-16-19:27:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
6 |
|
3
34a521b1a148
nginx-0.0.1-2002-08-20-18:48:28 import
Igor Sysoev <igor@sysoev.ru>
parents:
2
diff
changeset
|
7 #include <ngx_config.h> |
|
100
7ebc8b7fb816
nginx-0.0.1-2003-06-03-19:42:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
98
diff
changeset
|
8 #include <ngx_core.h> |
|
2
ffffe1499bce
nginx-0.0.1-2002-08-16-19:27:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 #include <ngx_http.h> |
|
ffffe1499bce
nginx-0.0.1-2002-08-16-19:27:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
11 |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
12 static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
| 2021 | 13 static ngx_int_t ngx_http_init_phases(ngx_conf_t *cf, |
| 14 ngx_http_core_main_conf_t *cmcf); | |
| 15 static ngx_int_t ngx_http_init_headers_in_hash(ngx_conf_t *cf, | |
| 16 ngx_http_core_main_conf_t *cmcf); | |
| 17 static ngx_int_t ngx_http_init_phase_handlers(ngx_conf_t *cf, | |
| 18 ngx_http_core_main_conf_t *cmcf); | |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
19 |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
20 static ngx_int_t ngx_http_add_addresses(ngx_conf_t *cf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
21 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_port_t *port, |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
22 ngx_http_listen_opt_t *lsopt); |
| 455 | 23 static ngx_int_t ngx_http_add_address(ngx_conf_t *cf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
24 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_port_t *port, |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
25 ngx_http_listen_opt_t *lsopt); |
| 3219 | 26 static ngx_int_t ngx_http_add_server(ngx_conf_t *cf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
27 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_addr_t *addr); |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
28 |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
368
diff
changeset
|
29 static char *ngx_http_merge_locations(ngx_conf_t *cf, |
| 2027 | 30 ngx_queue_t *locations, void **loc_conf, ngx_http_module_t *module, |
| 499 | 31 ngx_uint_t ctx_index); |
| 2027 | 32 static ngx_int_t ngx_http_init_locations(ngx_conf_t *cf, |
| 33 ngx_http_core_srv_conf_t *cscf, ngx_http_core_loc_conf_t *pclcf); | |
| 34 static ngx_int_t ngx_http_init_static_location_trees(ngx_conf_t *cf, | |
| 35 ngx_http_core_loc_conf_t *pclcf); | |
| 36 static ngx_int_t ngx_http_cmp_locations(const ngx_queue_t *one, | |
| 37 const ngx_queue_t *two); | |
| 38 static ngx_int_t ngx_http_join_exact_locations(ngx_conf_t *cf, | |
| 39 ngx_queue_t *locations); | |
| 40 static void ngx_http_create_locations_list(ngx_queue_t *locations, | |
| 41 ngx_queue_t *q); | |
| 42 static ngx_http_location_tree_node_t * | |
| 43 ngx_http_create_locations_tree(ngx_conf_t *cf, ngx_queue_t *locations, | |
| 44 size_t prefix); | |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
45 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
46 static ngx_int_t ngx_http_optimize_servers(ngx_conf_t *cf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
47 ngx_http_core_main_conf_t *cmcf, ngx_array_t *ports); |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
48 static ngx_int_t ngx_http_server_names(ngx_conf_t *cf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
49 ngx_http_core_main_conf_t *cmcf, ngx_http_conf_addr_t *addr); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
50 static ngx_int_t ngx_http_cmp_conf_addrs(const void *one, const void *two); |
| 593 | 51 static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one, |
| 52 const void *two); | |
|
212
679f60139863
nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
201
diff
changeset
|
53 |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
54 static ngx_int_t ngx_http_init_listening(ngx_conf_t *cf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
55 ngx_http_conf_port_t *port); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
56 static ngx_listening_t *ngx_http_add_listening(ngx_conf_t *cf, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
57 ngx_http_conf_addr_t *addr); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
58 static ngx_int_t ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
59 ngx_http_conf_addr_t *addr); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
60 #if (NGX_HAVE_INET6) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
61 static ngx_int_t ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
62 ngx_http_conf_addr_t *addr); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
63 #endif |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
64 |
| 593 | 65 ngx_uint_t ngx_http_max_module; |
| 66 | |
|
45
f1ee46c036a4
nginx-0.0.1-2003-01-10-09:09:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
44
diff
changeset
|
67 |
|
356
2e3cbc1bbe3c
nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
311
diff
changeset
|
68 ngx_int_t (*ngx_http_top_header_filter) (ngx_http_request_t *r); |
|
2e3cbc1bbe3c
nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
311
diff
changeset
|
69 ngx_int_t (*ngx_http_top_body_filter) (ngx_http_request_t *r, ngx_chain_t *ch); |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
70 |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
71 |
|
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
72 ngx_str_t ngx_http_html_default_types[] = { |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
73 ngx_string("text/html"), |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
74 ngx_null_string |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
75 }; |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
76 |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
77 |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
78 static ngx_command_t ngx_http_commands[] = { |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
79 |
| 499 | 80 { ngx_string("http"), |
| 81 NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS, | |
| 82 ngx_http_block, | |
| 83 0, | |
| 84 0, | |
| 85 NULL }, | |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
86 |
| 499 | 87 ngx_null_command |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
88 }; |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
89 |
| 577 | 90 |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
291
diff
changeset
|
91 static ngx_core_module_t ngx_http_module_ctx = { |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
291
diff
changeset
|
92 ngx_string("http"), |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
291
diff
changeset
|
93 NULL, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
291
diff
changeset
|
94 NULL |
| 577 | 95 }; |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
291
diff
changeset
|
96 |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
97 |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
98 ngx_module_t ngx_http_module = { |
| 509 | 99 NGX_MODULE_V1, |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
291
diff
changeset
|
100 &ngx_http_module_ctx, /* module context */ |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
101 ngx_http_commands, /* module directives */ |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
102 NGX_CORE_MODULE, /* module type */ |
| 541 | 103 NULL, /* init master */ |
|
116
571bcbff82c5
nginx-0.0.1-2003-07-11-08:50:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
114
diff
changeset
|
104 NULL, /* init module */ |
| 541 | 105 NULL, /* init process */ |
| 106 NULL, /* init thread */ | |
| 107 NULL, /* exit thread */ | |
| 108 NULL, /* exit process */ | |
| 109 NULL, /* exit master */ | |
| 110 NGX_MODULE_V1_PADDING | |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
111 }; |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
112 |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
113 |
| 499 | 114 static char * |
| 115 ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
116 { |
|
419
47709bff4468
nginx-0.0.10-2004-09-09-19:40:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
417
diff
changeset
|
117 char *rv; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
118 ngx_uint_t mi, m, s; |
|
216
f1d0e5f09c1e
nginx-0.0.1-2003-12-25-23:26:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
213
diff
changeset
|
119 ngx_conf_t pcf; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
120 ngx_http_module_t *module; |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
121 ngx_http_conf_ctx_t *ctx; |
| 2027 | 122 ngx_http_core_loc_conf_t *clcf; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
123 ngx_http_core_srv_conf_t **cscfp; |
|
216
f1d0e5f09c1e
nginx-0.0.1-2003-12-25-23:26:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
213
diff
changeset
|
124 ngx_http_core_main_conf_t *cmcf; |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
125 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
126 /* the main http context */ |
| 477 | 127 |
| 501 | 128 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)); |
| 129 if (ctx == NULL) { | |
| 485 | 130 return NGX_CONF_ERROR; |
| 131 } | |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
132 |
|
90
37530da31268
nginx-0.0.1-2003-05-16-19:27:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
89
diff
changeset
|
133 *(ngx_http_conf_ctx_t **) conf = ctx; |
|
37530da31268
nginx-0.0.1-2003-05-16-19:27:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
89
diff
changeset
|
134 |
| 485 | 135 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
136 /* count the number of the http modules and set up their indices */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
137 |
|
71
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
138 ngx_http_max_module = 0; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
139 for (m = 0; ngx_modules[m]; m++) { |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
140 if (ngx_modules[m]->type != NGX_HTTP_MODULE) { |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
141 continue; |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
142 } |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
143 |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
144 ngx_modules[m]->ctx_index = ngx_http_max_module++; |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
145 } |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
146 |
| 477 | 147 |
| 485 | 148 /* the http main_conf context, it is the same in the all http contexts */ |
|
90
37530da31268
nginx-0.0.1-2003-05-16-19:27:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
89
diff
changeset
|
149 |
| 485 | 150 ctx->main_conf = ngx_pcalloc(cf->pool, |
| 151 sizeof(void *) * ngx_http_max_module); | |
| 152 if (ctx->main_conf == NULL) { | |
| 153 return NGX_CONF_ERROR; | |
| 154 } | |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
155 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
156 |
| 485 | 157 /* |
| 158 * the http null srv_conf context, it is used to merge | |
| 159 * the server{}s' srv_conf's | |
| 160 */ | |
| 161 | |
| 162 ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
| 163 if (ctx->srv_conf == NULL) { | |
| 164 return NGX_CONF_ERROR; | |
| 165 } | |
| 166 | |
| 167 | |
| 168 /* | |
| 169 * the http null loc_conf context, it is used to merge | |
| 170 * the server{}s' loc_conf's | |
| 171 */ | |
| 172 | |
| 173 ctx->loc_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
| 174 if (ctx->loc_conf == NULL) { | |
| 175 return NGX_CONF_ERROR; | |
| 176 } | |
| 177 | |
| 178 | |
| 179 /* | |
| 180 * create the main_conf's, the null srv_conf's, and the null loc_conf's | |
| 181 * of the all http modules | |
| 182 */ | |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
183 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
184 for (m = 0; ngx_modules[m]; m++) { |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
185 if (ngx_modules[m]->type != NGX_HTTP_MODULE) { |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
186 continue; |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
187 } |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
188 |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
189 module = ngx_modules[m]->ctx; |
|
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
190 mi = ngx_modules[m]->ctx_index; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
191 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
192 if (module->create_main_conf) { |
| 501 | 193 ctx->main_conf[mi] = module->create_main_conf(cf); |
| 194 if (ctx->main_conf[mi] == NULL) { | |
| 485 | 195 return NGX_CONF_ERROR; |
| 196 } | |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
197 } |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
198 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
199 if (module->create_srv_conf) { |
| 501 | 200 ctx->srv_conf[mi] = module->create_srv_conf(cf); |
| 201 if (ctx->srv_conf[mi] == NULL) { | |
| 485 | 202 return NGX_CONF_ERROR; |
| 203 } | |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
204 } |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
205 |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
206 if (module->create_loc_conf) { |
| 501 | 207 ctx->loc_conf[mi] = module->create_loc_conf(cf); |
| 208 if (ctx->loc_conf[mi] == NULL) { | |
| 485 | 209 return NGX_CONF_ERROR; |
| 210 } | |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
211 } |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
212 } |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
213 |
| 509 | 214 pcf = *cf; |
| 215 cf->ctx = ctx; | |
| 216 | |
| 217 for (m = 0; ngx_modules[m]; m++) { | |
| 218 if (ngx_modules[m]->type != NGX_HTTP_MODULE) { | |
| 219 continue; | |
| 220 } | |
| 221 | |
| 222 module = ngx_modules[m]->ctx; | |
| 223 | |
| 224 if (module->preconfiguration) { | |
| 225 if (module->preconfiguration(cf) != NGX_OK) { | |
| 226 return NGX_CONF_ERROR; | |
| 227 } | |
| 228 } | |
| 229 } | |
| 485 | 230 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
231 /* parse inside the http{} block */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
232 |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
233 cf->module_type = NGX_HTTP_MODULE; |
|
88
674d333f4296
nginx-0.0.1-2003-05-14-21:13:13 import
Igor Sysoev <igor@sysoev.ru>
parents:
81
diff
changeset
|
234 cf->cmd_type = NGX_HTTP_MAIN_CONF; |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
235 rv = ngx_conf_parse(cf, NULL); |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
236 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
237 if (rv != NGX_CONF_OK) { |
| 2027 | 238 goto failed; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
239 } |
|
54
27b628ef907e
nginx-0.0.1-2003-01-28-18:56:37 import
Igor Sysoev <igor@sysoev.ru>
parents:
45
diff
changeset
|
240 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
241 /* |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
242 * init http{} main_conf's, merge the server{}s' srv_conf's |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
243 * and its location{}s' loc_conf's |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
244 */ |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
245 |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
246 cmcf = ctx->main_conf[ngx_http_core_module.ctx_index]; |
|
98
c9b243802a17
nginx-0.0.1-2003-05-30-18:27:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
96
diff
changeset
|
247 cscfp = cmcf->servers.elts; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
248 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
249 for (m = 0; ngx_modules[m]; m++) { |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
250 if (ngx_modules[m]->type != NGX_HTTP_MODULE) { |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
251 continue; |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
252 } |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
253 |
|
98
c9b243802a17
nginx-0.0.1-2003-05-30-18:27:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
96
diff
changeset
|
254 module = ngx_modules[m]->ctx; |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
95
diff
changeset
|
255 mi = ngx_modules[m]->ctx_index; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
256 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
257 /* init http{} main_conf's */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
258 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
259 if (module->init_main_conf) { |
|
119
cd54bcbaf3b5
nginx-0.0.1-2003-07-21-01:15:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
116
diff
changeset
|
260 rv = module->init_main_conf(cf, ctx->main_conf[mi]); |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
261 if (rv != NGX_CONF_OK) { |
| 2027 | 262 goto failed; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
263 } |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
264 } |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
265 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
266 for (s = 0; s < cmcf->servers.nelts; s++) { |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
267 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
268 /* merge the server{}s' srv_conf's */ |
|
54
27b628ef907e
nginx-0.0.1-2003-01-28-18:56:37 import
Igor Sysoev <igor@sysoev.ru>
parents:
45
diff
changeset
|
269 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
270 if (module->merge_srv_conf) { |
| 2027 | 271 rv = module->merge_srv_conf(cf, ctx->srv_conf[mi], |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
272 cscfp[s]->ctx->srv_conf[mi]); |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
273 if (rv != NGX_CONF_OK) { |
| 2027 | 274 goto failed; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
275 } |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
276 } |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
277 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
278 if (module->merge_loc_conf) { |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
279 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
280 /* merge the server{}'s loc_conf */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
281 |
| 2027 | 282 rv = module->merge_loc_conf(cf, ctx->loc_conf[mi], |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
283 cscfp[s]->ctx->loc_conf[mi]); |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
284 if (rv != NGX_CONF_OK) { |
| 2027 | 285 goto failed; |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
286 } |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
287 |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
288 /* merge the locations{}' loc_conf's */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
289 |
| 2027 | 290 clcf = cscfp[s]->ctx->loc_conf[ngx_http_core_module.ctx_index]; |
| 291 | |
| 292 rv = ngx_http_merge_locations(cf, clcf->locations, | |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
368
diff
changeset
|
293 cscfp[s]->ctx->loc_conf, |
|
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
368
diff
changeset
|
294 module, mi); |
|
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
368
diff
changeset
|
295 if (rv != NGX_CONF_OK) { |
| 2027 | 296 goto failed; |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
368
diff
changeset
|
297 } |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
298 } |
|
54
27b628ef907e
nginx-0.0.1-2003-01-28-18:56:37 import
Igor Sysoev <igor@sysoev.ru>
parents:
45
diff
changeset
|
299 } |
|
27b628ef907e
nginx-0.0.1-2003-01-28-18:56:37 import
Igor Sysoev <igor@sysoev.ru>
parents:
45
diff
changeset
|
300 } |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
301 |
| 485 | 302 |
| 2027 | 303 /* create location trees */ |
| 304 | |
| 305 for (s = 0; s < cmcf->servers.nelts; s++) { | |
| 306 | |
| 307 clcf = cscfp[s]->ctx->loc_conf[ngx_http_core_module.ctx_index]; | |
| 308 | |
| 309 if (ngx_http_init_locations(cf, cscfp[s], clcf) != NGX_OK) { | |
| 310 return NGX_CONF_ERROR; | |
| 311 } | |
| 312 | |
| 313 if (ngx_http_init_static_location_trees(cf, clcf) != NGX_OK) { | |
| 314 return NGX_CONF_ERROR; | |
| 315 } | |
| 316 } | |
| 317 | |
| 318 | |
| 2021 | 319 if (ngx_http_init_phases(cf, cmcf) != NGX_OK) { |
| 485 | 320 return NGX_CONF_ERROR; |
| 321 } | |
| 322 | |
| 2021 | 323 if (ngx_http_init_headers_in_hash(cf, cmcf) != NGX_OK) { |
| 649 | 324 return NGX_CONF_ERROR; |
| 325 } | |
| 326 | |
| 509 | 327 |
| 328 for (m = 0; ngx_modules[m]; m++) { | |
| 329 if (ngx_modules[m]->type != NGX_HTTP_MODULE) { | |
| 330 continue; | |
| 331 } | |
| 332 | |
| 333 module = ngx_modules[m]->ctx; | |
| 334 | |
| 335 if (module->postconfiguration) { | |
| 336 if (module->postconfiguration(cf) != NGX_OK) { | |
| 337 return NGX_CONF_ERROR; | |
| 338 } | |
| 339 } | |
| 340 } | |
| 341 | |
| 573 | 342 if (ngx_http_variables_init_vars(cf) != NGX_OK) { |
| 343 return NGX_CONF_ERROR; | |
| 344 } | |
| 509 | 345 |
| 346 /* | |
| 347 * http{}'s cf->ctx was needed while the configuration merging | |
| 348 * and in postconfiguration process | |
| 349 */ | |
| 350 | |
| 351 *cf = pcf; | |
| 352 | |
| 507 | 353 |
| 2021 | 354 if (ngx_http_init_phase_handlers(cf, cmcf) != NGX_OK) { |
| 681 | 355 return NGX_CONF_ERROR; |
| 356 } | |
| 357 | |
| 358 | |
| 455 | 359 /* optimize the lists of ports, addresses and server names */ |
|
54
27b628ef907e
nginx-0.0.1-2003-01-28-18:56:37 import
Igor Sysoev <igor@sysoev.ru>
parents:
45
diff
changeset
|
360 |
| 3217 | 361 if (ngx_http_optimize_servers(cf, cmcf, cmcf->ports) != NGX_OK) { |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
362 return NGX_CONF_ERROR; |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
363 } |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
364 |
|
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
365 return NGX_CONF_OK; |
| 2027 | 366 |
| 367 failed: | |
| 368 | |
| 369 *cf = pcf; | |
| 370 | |
| 371 return rv; | |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
41
diff
changeset
|
372 } |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
368
diff
changeset
|
373 |
|
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
368
diff
changeset
|
374 |
| 2021 | 375 static ngx_int_t |
| 376 ngx_http_init_phases(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf) | |
| 377 { | |
| 378 if (ngx_array_init(&cmcf->phases[NGX_HTTP_POST_READ_PHASE].handlers, | |
| 379 cf->pool, 1, sizeof(ngx_http_handler_pt)) | |
| 380 != NGX_OK) | |
| 381 { | |
| 382 return NGX_ERROR; | |
| 383 } | |
| 384 | |
| 385 if (ngx_array_init(&cmcf->phases[NGX_HTTP_SERVER_REWRITE_PHASE].handlers, | |
| 386 cf->pool, 1, sizeof(ngx_http_handler_pt)) | |
| 387 != NGX_OK) | |
| 388 { | |
| 389 return NGX_ERROR; | |
| 390 } | |
| 391 | |
| 392 if (ngx_array_init(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers, | |
| 393 cf->pool, 1, sizeof(ngx_http_handler_pt)) | |
| 394 != NGX_OK) | |
| 395 { | |
| 396 return NGX_ERROR; | |
| 397 } | |
| 398 | |
| 399 if (ngx_array_init(&cmcf->phases[NGX_HTTP_PREACCESS_PHASE].handlers, | |
| 400 cf->pool, 1, sizeof(ngx_http_handler_pt)) | |
| 401 != NGX_OK) | |
| 402 { | |
| 403 return NGX_ERROR; | |
| 404 } | |
| 405 | |
| 406 if (ngx_array_init(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers, | |
| 407 cf->pool, 2, sizeof(ngx_http_handler_pt)) | |
| 408 != NGX_OK) | |
| 409 { | |
| 410 return NGX_ERROR; | |
| 411 } | |
| 412 | |
| 413 if (ngx_array_init(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers, | |
| 414 cf->pool, 4, sizeof(ngx_http_handler_pt)) | |
| 415 != NGX_OK) | |
| 416 { | |
| 417 return NGX_ERROR; | |
| 418 } | |
| 419 | |
| 420 if (ngx_array_init(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers, | |
| 421 cf->pool, 1, sizeof(ngx_http_handler_pt)) | |
| 422 != NGX_OK) | |
| 423 { | |
| 424 return NGX_ERROR; | |
| 425 } | |
| 426 | |
| 427 return NGX_OK; | |
| 428 } | |
| 429 | |
| 430 | |
| 431 static ngx_int_t | |
| 432 ngx_http_init_headers_in_hash(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf) | |
| 433 { | |
| 434 ngx_array_t headers_in; | |
| 435 ngx_hash_key_t *hk; | |
| 436 ngx_hash_init_t hash; | |
| 437 ngx_http_header_t *header; | |
| 438 | |
| 439 if (ngx_array_init(&headers_in, cf->temp_pool, 32, sizeof(ngx_hash_key_t)) | |
| 440 != NGX_OK) | |
| 441 { | |
| 442 return NGX_ERROR; | |
| 443 } | |
| 444 | |
| 445 for (header = ngx_http_headers_in; header->name.len; header++) { | |
| 446 hk = ngx_array_push(&headers_in); | |
| 447 if (hk == NULL) { | |
| 448 return NGX_ERROR; | |
| 449 } | |
| 450 | |
| 451 hk->key = header->name; | |
| 452 hk->key_hash = ngx_hash_key_lc(header->name.data, header->name.len); | |
| 453 hk->value = header; | |
| 454 } | |
| 455 | |
| 456 hash.hash = &cmcf->headers_in_hash; | |
| 457 hash.key = ngx_hash_key_lc; | |
| 458 hash.max_size = 512; | |
| 459 hash.bucket_size = ngx_align(64, ngx_cacheline_size); | |
| 460 hash.name = "headers_in_hash"; | |
| 461 hash.pool = cf->pool; | |
| 462 hash.temp_pool = NULL; | |
| 463 | |
| 464 if (ngx_hash_init(&hash, headers_in.elts, headers_in.nelts) != NGX_OK) { | |
| 465 return NGX_ERROR; | |
| 466 } | |
| 467 | |
| 468 return NGX_OK; | |
| 469 } | |
| 470 | |
| 471 | |
| 472 static ngx_int_t | |
| 473 ngx_http_init_phase_handlers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf) | |
| 474 { | |
| 475 ngx_int_t j; | |
| 476 ngx_uint_t i, n; | |
| 477 ngx_uint_t find_config_index, use_rewrite, use_access; | |
| 478 ngx_http_handler_pt *h; | |
| 479 ngx_http_phase_handler_t *ph; | |
| 480 ngx_http_phase_handler_pt checker; | |
| 481 | |
| 482 cmcf->phase_engine.server_rewrite_index = (ngx_uint_t) -1; | |
| 483 cmcf->phase_engine.location_rewrite_index = (ngx_uint_t) -1; | |
| 484 find_config_index = 0; | |
| 485 use_rewrite = cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers.nelts ? 1 : 0; | |
| 486 use_access = cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers.nelts ? 1 : 0; | |
| 487 | |
| 2407 | 488 n = use_rewrite + use_access + cmcf->try_files + 1 /* find config phase */; |
| 2021 | 489 |
| 490 for (i = 0; i < NGX_HTTP_LOG_PHASE; i++) { | |
| 491 n += cmcf->phases[i].handlers.nelts; | |
| 492 } | |
| 493 | |
| 494 ph = ngx_pcalloc(cf->pool, | |
| 495 n * sizeof(ngx_http_phase_handler_t) + sizeof(void *)); | |
| 496 if (ph == NULL) { | |
| 497 return NGX_ERROR; | |
| 498 } | |
| 499 | |
| 500 cmcf->phase_engine.handlers = ph; | |
| 501 n = 0; | |
| 502 | |
| 503 for (i = 0; i < NGX_HTTP_LOG_PHASE; i++) { | |
| 504 h = cmcf->phases[i].handlers.elts; | |
| 505 | |
| 506 switch (i) { | |
| 507 | |
| 508 case NGX_HTTP_SERVER_REWRITE_PHASE: | |
| 509 if (cmcf->phase_engine.server_rewrite_index == (ngx_uint_t) -1) { | |
| 510 cmcf->phase_engine.server_rewrite_index = n; | |
| 511 } | |
| 512 checker = ngx_http_core_generic_phase; | |
| 513 | |
| 514 break; | |
| 515 | |
| 516 case NGX_HTTP_FIND_CONFIG_PHASE: | |
| 517 find_config_index = n; | |
| 518 | |
| 519 ph->checker = ngx_http_core_find_config_phase; | |
| 520 n++; | |
| 521 ph++; | |
| 522 | |
| 523 continue; | |
| 524 | |
| 525 case NGX_HTTP_REWRITE_PHASE: | |
| 526 if (cmcf->phase_engine.location_rewrite_index == (ngx_uint_t) -1) { | |
| 527 cmcf->phase_engine.location_rewrite_index = n; | |
| 528 } | |
| 529 checker = ngx_http_core_generic_phase; | |
| 530 | |
| 531 break; | |
| 532 | |
| 533 case NGX_HTTP_POST_REWRITE_PHASE: | |
| 534 if (use_rewrite) { | |
| 535 ph->checker = ngx_http_core_post_rewrite_phase; | |
| 536 ph->next = find_config_index; | |
| 537 n++; | |
| 538 ph++; | |
| 539 } | |
| 540 | |
| 541 continue; | |
| 542 | |
| 543 case NGX_HTTP_ACCESS_PHASE: | |
| 544 checker = ngx_http_core_access_phase; | |
| 545 n++; | |
| 546 break; | |
| 547 | |
| 548 case NGX_HTTP_POST_ACCESS_PHASE: | |
| 549 if (use_access) { | |
| 550 ph->checker = ngx_http_core_post_access_phase; | |
| 551 ph->next = n; | |
| 552 ph++; | |
| 553 } | |
| 554 | |
| 555 continue; | |
| 556 | |
| 2407 | 557 case NGX_HTTP_TRY_FILES_PHASE: |
| 558 if (cmcf->try_files) { | |
| 559 ph->checker = ngx_http_core_try_files_phase; | |
| 560 n++; | |
| 561 ph++; | |
| 562 } | |
| 563 | |
| 564 continue; | |
| 565 | |
| 2021 | 566 case NGX_HTTP_CONTENT_PHASE: |
| 567 checker = ngx_http_core_content_phase; | |
| 568 break; | |
| 569 | |
| 570 default: | |
| 571 checker = ngx_http_core_generic_phase; | |
| 572 } | |
| 573 | |
| 574 n += cmcf->phases[i].handlers.nelts; | |
| 575 | |
| 576 for (j = cmcf->phases[i].handlers.nelts - 1; j >=0; j--) { | |
| 577 ph->checker = checker; | |
| 578 ph->handler = h[j]; | |
| 579 ph->next = n; | |
| 580 ph++; | |
| 581 } | |
| 582 } | |
| 583 | |
| 584 return NGX_OK; | |
| 585 } | |
| 586 | |
| 587 | |
| 2027 | 588 static char * |
| 589 ngx_http_merge_locations(ngx_conf_t *cf, ngx_queue_t *locations, | |
| 590 void **loc_conf, ngx_http_module_t *module, ngx_uint_t ctx_index) | |
| 591 { | |
| 592 char *rv; | |
| 593 ngx_queue_t *q; | |
| 594 ngx_http_core_loc_conf_t *clcf; | |
| 595 ngx_http_location_queue_t *lq; | |
| 596 | |
| 597 if (locations == NULL) { | |
| 598 return NGX_CONF_OK; | |
| 599 } | |
| 600 | |
| 601 for (q = ngx_queue_head(locations); | |
| 602 q != ngx_queue_sentinel(locations); | |
| 603 q = ngx_queue_next(q)) | |
| 604 { | |
| 605 lq = (ngx_http_location_queue_t *) q; | |
| 606 | |
| 607 clcf = lq->exact ? lq->exact : lq->inclusive; | |
| 608 | |
| 609 rv = module->merge_loc_conf(cf, loc_conf[ctx_index], | |
| 610 clcf->loc_conf[ctx_index]); | |
| 611 if (rv != NGX_CONF_OK) { | |
| 612 return rv; | |
| 613 } | |
| 614 | |
| 615 rv = ngx_http_merge_locations(cf, clcf->locations, clcf->loc_conf, | |
| 616 module, ctx_index); | |
| 617 if (rv != NGX_CONF_OK) { | |
| 618 return rv; | |
| 619 } | |
| 620 } | |
| 621 | |
| 622 return NGX_CONF_OK; | |
| 623 } | |
| 624 | |
| 625 | |
| 626 static ngx_int_t | |
| 627 ngx_http_init_locations(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, | |
| 628 ngx_http_core_loc_conf_t *pclcf) | |
| 629 { | |
| 630 ngx_uint_t n; | |
| 631 ngx_queue_t *q, *locations, *named, tail; | |
| 632 ngx_http_core_loc_conf_t *clcf; | |
| 633 ngx_http_location_queue_t *lq; | |
| 634 ngx_http_core_loc_conf_t **clcfp; | |
| 635 #if (NGX_PCRE) | |
| 636 ngx_uint_t r; | |
| 637 ngx_queue_t *regex; | |
| 638 #endif | |
| 639 | |
| 640 locations = pclcf->locations; | |
| 641 | |
| 642 if (locations == NULL) { | |
| 643 return NGX_OK; | |
| 644 } | |
| 645 | |
| 646 ngx_queue_sort(locations, ngx_http_cmp_locations); | |
| 647 | |
| 648 named = NULL; | |
| 649 n = 0; | |
| 650 #if (NGX_PCRE) | |
| 651 regex = NULL; | |
| 652 r = 0; | |
| 653 #endif | |
| 654 | |
| 655 for (q = ngx_queue_head(locations); | |
| 656 q != ngx_queue_sentinel(locations); | |
| 657 q = ngx_queue_next(q)) | |
| 658 { | |
| 659 lq = (ngx_http_location_queue_t *) q; | |
| 660 | |
| 661 clcf = lq->exact ? lq->exact : lq->inclusive; | |
| 662 | |
| 663 if (ngx_http_init_locations(cf, NULL, clcf) != NGX_OK) { | |
| 664 return NGX_ERROR; | |
| 665 } | |
| 666 | |
| 667 #if (NGX_PCRE) | |
| 668 | |
| 669 if (clcf->regex) { | |
| 670 r++; | |
| 671 | |
| 672 if (regex == NULL) { | |
| 673 regex = q; | |
| 674 } | |
| 675 | |
| 676 continue; | |
| 677 } | |
| 678 | |
| 679 #endif | |
| 680 | |
| 681 if (clcf->named) { | |
| 682 n++; | |
| 683 | |
| 684 if (named == NULL) { | |
| 685 named = q; | |
| 686 } | |
| 687 | |
| 688 continue; | |
| 689 } | |
| 690 | |
| 691 if (clcf->noname) { | |
| 692 break; | |
| 693 } | |
| 694 } | |
| 695 | |
| 696 if (q != ngx_queue_sentinel(locations)) { | |
| 697 ngx_queue_split(locations, q, &tail); | |
| 698 } | |
| 699 | |
| 700 if (named) { | |
| 701 clcfp = ngx_palloc(cf->pool, | |
| 702 (n + 1) * sizeof(ngx_http_core_loc_conf_t **)); | |
| 703 if (clcfp == NULL) { | |
| 704 return NGX_ERROR; | |
| 705 } | |
| 706 | |
| 707 cscf->named_locations = clcfp; | |
| 708 | |
| 709 for (q = named; | |
| 710 q != ngx_queue_sentinel(locations); | |
| 711 q = ngx_queue_next(q)) | |
| 712 { | |
| 713 lq = (ngx_http_location_queue_t *) q; | |
| 714 | |
| 715 *(clcfp++) = lq->exact; | |
| 716 } | |
| 717 | |
| 718 *clcfp = NULL; | |
| 719 | |
| 720 ngx_queue_split(locations, named, &tail); | |
| 721 } | |
| 722 | |
| 723 #if (NGX_PCRE) | |
| 724 | |
| 725 if (regex) { | |
| 726 | |
| 727 clcfp = ngx_palloc(cf->pool, | |
| 728 (r + 1) * sizeof(ngx_http_core_loc_conf_t **)); | |
| 729 if (clcfp == NULL) { | |
| 730 return NGX_ERROR; | |
| 731 } | |
| 732 | |
| 733 pclcf->regex_locations = clcfp; | |
| 734 | |
| 735 for (q = regex; | |
| 736 q != ngx_queue_sentinel(locations); | |
| 737 q = ngx_queue_next(q)) | |
| 738 { | |
| 739 lq = (ngx_http_location_queue_t *) q; | |
| 740 | |
| 741 *(clcfp++) = lq->exact; | |
| 742 } | |
| 743 | |
| 744 *clcfp = NULL; | |
| 745 | |
| 746 ngx_queue_split(locations, regex, &tail); | |
| 747 } | |
| 748 | |
| 749 #endif | |
| 750 | |
| 751 return NGX_OK; | |
| 752 } | |
| 753 | |
| 754 | |
| 755 static ngx_int_t | |
| 756 ngx_http_init_static_location_trees(ngx_conf_t *cf, | |
| 757 ngx_http_core_loc_conf_t *pclcf) | |
| 758 { | |
| 759 ngx_queue_t *q, *locations; | |
| 760 ngx_http_core_loc_conf_t *clcf; | |
| 761 ngx_http_location_queue_t *lq; | |
| 762 | |
| 763 locations = pclcf->locations; | |
| 764 | |
| 765 if (locations == NULL) { | |
| 766 return NGX_OK; | |
| 767 } | |
| 768 | |
| 769 if (ngx_queue_empty(locations)) { | |
| 770 return NGX_OK; | |
| 771 } | |
| 772 | |
| 773 for (q = ngx_queue_head(locations); | |
| 774 q != ngx_queue_sentinel(locations); | |
| 775 q = ngx_queue_next(q)) | |
| 776 { | |
| 777 lq = (ngx_http_location_queue_t *) q; | |
| 778 | |
| 779 clcf = lq->exact ? lq->exact : lq->inclusive; | |
| 780 | |
| 781 if (ngx_http_init_static_location_trees(cf, clcf) != NGX_OK) { | |
| 782 return NGX_ERROR; | |
| 783 } | |
| 784 } | |
| 785 | |
| 786 if (ngx_http_join_exact_locations(cf, locations) != NGX_OK) { | |
| 787 return NGX_ERROR; | |
| 788 } | |
| 789 | |
| 790 ngx_http_create_locations_list(locations, ngx_queue_head(locations)); | |
| 791 | |
| 792 pclcf->static_locations = ngx_http_create_locations_tree(cf, locations, 0); | |
| 793 if (pclcf->static_locations == NULL) { | |
| 794 return NGX_ERROR; | |
| 795 } | |
| 796 | |
| 797 return NGX_OK; | |
| 798 } | |
| 799 | |
| 800 | |
| 801 ngx_int_t | |
| 802 ngx_http_add_location(ngx_conf_t *cf, ngx_queue_t **locations, | |
| 803 ngx_http_core_loc_conf_t *clcf) | |
| 804 { | |
| 805 ngx_http_location_queue_t *lq; | |
| 806 | |
| 807 if (*locations == NULL) { | |
| 808 *locations = ngx_palloc(cf->temp_pool, | |
| 809 sizeof(ngx_http_location_queue_t)); | |
| 810 if (*locations == NULL) { | |
| 811 return NGX_ERROR; | |
| 812 } | |
| 813 | |
| 814 ngx_queue_init(*locations); | |
| 815 } | |
| 816 | |
| 817 lq = ngx_palloc(cf->temp_pool, sizeof(ngx_http_location_queue_t)); | |
| 818 if (lq == NULL) { | |
| 819 return NGX_ERROR; | |
| 820 } | |
| 821 | |
| 822 if (clcf->exact_match | |
| 823 #if (NGX_PCRE) | |
| 824 || clcf->regex | |
| 825 #endif | |
| 826 || clcf->named || clcf->noname) | |
| 827 { | |
| 828 lq->exact = clcf; | |
| 829 lq->inclusive = NULL; | |
| 830 | |
| 831 } else { | |
| 832 lq->exact = NULL; | |
| 833 lq->inclusive = clcf; | |
| 834 } | |
| 835 | |
| 836 lq->name = &clcf->name; | |
| 837 lq->file_name = cf->conf_file->file.name.data; | |
| 838 lq->line = cf->conf_file->line; | |
| 839 | |
| 840 ngx_queue_init(&lq->list); | |
| 841 | |
| 842 ngx_queue_insert_tail(*locations, &lq->queue); | |
| 843 | |
| 844 return NGX_OK; | |
| 845 } | |
| 846 | |
| 847 | |
| 848 static ngx_int_t | |
| 849 ngx_http_cmp_locations(const ngx_queue_t *one, const ngx_queue_t *two) | |
| 850 { | |
| 851 ngx_int_t rc; | |
| 852 ngx_http_core_loc_conf_t *first, *second; | |
| 853 ngx_http_location_queue_t *lq1, *lq2; | |
| 854 | |
| 855 lq1 = (ngx_http_location_queue_t *) one; | |
| 856 lq2 = (ngx_http_location_queue_t *) two; | |
| 857 | |
| 858 first = lq1->exact ? lq1->exact : lq1->inclusive; | |
| 859 second = lq2->exact ? lq2->exact : lq2->inclusive; | |
| 860 | |
| 861 if (first->noname && !second->noname) { | |
| 862 /* shift no named locations to the end */ | |
| 863 return 1; | |
| 864 } | |
| 865 | |
| 866 if (!first->noname && second->noname) { | |
| 867 /* shift no named locations to the end */ | |
| 868 return -1; | |
| 869 } | |
| 870 | |
| 871 if (first->noname || second->noname) { | |
| 872 /* do not sort no named locations */ | |
| 873 return 0; | |
| 874 } | |
| 875 | |
| 876 if (first->named && !second->named) { | |
| 877 /* shift named locations to the end */ | |
| 878 return 1; | |
| 879 } | |
| 880 | |
| 881 if (!first->named && second->named) { | |
| 882 /* shift named locations to the end */ | |
| 883 return -1; | |
| 884 } | |
| 885 | |
| 886 if (first->named && second->named) { | |
| 887 return ngx_strcmp(first->name.data, second->name.data); | |
| 888 } | |
| 889 | |
| 890 #if (NGX_PCRE) | |
| 891 | |
| 892 if (first->regex && !second->regex) { | |
| 893 /* shift the regex matches to the end */ | |
| 894 return 1; | |
| 895 } | |
| 896 | |
| 897 if (!first->regex && second->regex) { | |
| 898 /* shift the regex matches to the end */ | |
| 899 return -1; | |
| 900 } | |
| 901 | |
| 902 if (first->regex || second->regex) { | |
| 903 /* do not sort the regex matches */ | |
| 904 return 0; | |
| 905 } | |
| 906 | |
| 907 #endif | |
| 908 | |
| 909 rc = ngx_strcmp(first->name.data, second->name.data); | |
| 910 | |
| 911 if (rc == 0 && !first->exact_match && second->exact_match) { | |
| 912 /* an exact match must be before the same inclusive one */ | |
| 913 return 1; | |
| 914 } | |
| 915 | |
| 916 return rc; | |
| 917 } | |
| 918 | |
| 919 | |
| 920 static ngx_int_t | |
| 921 ngx_http_join_exact_locations(ngx_conf_t *cf, ngx_queue_t *locations) | |
| 922 { | |
| 923 ngx_queue_t *q, *x; | |
| 924 ngx_http_location_queue_t *lq, *lx; | |
| 925 | |
| 926 q = ngx_queue_head(locations); | |
| 927 | |
| 928 while (q != ngx_queue_last(locations)) { | |
| 929 | |
| 930 x = ngx_queue_next(q); | |
| 931 | |
| 932 lq = (ngx_http_location_queue_t *) q; | |
| 933 lx = (ngx_http_location_queue_t *) x; | |
| 934 | |
| 935 if (ngx_strcmp(lq->name->data, lx->name->data) == 0) { | |
| 936 | |
| 937 if ((lq->exact && lx->exact) || (lq->inclusive && lx->inclusive)) { | |
| 938 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 939 "duplicate location \"%V\" in %s:%ui", | |
| 940 lx->name, lx->file_name, lx->line); | |
| 941 | |
| 942 return NGX_ERROR; | |
| 943 } | |
| 944 | |
| 945 lq->inclusive = lx->inclusive; | |
| 946 | |
| 947 ngx_queue_remove(x); | |
| 948 | |
| 949 continue; | |
| 950 } | |
| 951 | |
| 952 q = ngx_queue_next(q); | |
| 953 } | |
| 954 | |
| 955 return NGX_OK; | |
| 956 } | |
| 957 | |
| 958 | |
| 959 static void | |
| 960 ngx_http_create_locations_list(ngx_queue_t *locations, ngx_queue_t *q) | |
| 961 { | |
| 962 u_char *name; | |
| 963 size_t len; | |
| 964 ngx_queue_t *x, tail; | |
| 965 ngx_http_location_queue_t *lq, *lx; | |
| 966 | |
| 967 if (q == ngx_queue_last(locations)) { | |
| 968 return; | |
| 969 } | |
| 970 | |
| 971 lq = (ngx_http_location_queue_t *) q; | |
| 972 | |
| 973 if (lq->inclusive == NULL) { | |
| 974 ngx_http_create_locations_list(locations, ngx_queue_next(q)); | |
| 975 return; | |
| 976 } | |
| 977 | |
| 978 len = lq->name->len; | |
| 979 name = lq->name->data; | |
| 980 | |
| 981 for (x = ngx_queue_next(q); | |
| 982 x != ngx_queue_sentinel(locations); | |
| 983 x = ngx_queue_next(x)) | |
| 984 { | |
| 985 lx = (ngx_http_location_queue_t *) x; | |
| 986 | |
| 987 if (len > lx->name->len | |
| 988 || (ngx_strncmp(name, lx->name->data, len) != 0)) | |
| 989 { | |
| 990 break; | |
| 991 } | |
| 992 } | |
| 993 | |
| 994 q = ngx_queue_next(q); | |
| 995 | |
| 996 if (q == x) { | |
| 997 ngx_http_create_locations_list(locations, x); | |
| 998 return; | |
| 999 } | |
| 1000 | |
| 1001 ngx_queue_split(locations, q, &tail); | |
| 1002 ngx_queue_add(&lq->list, &tail); | |
| 1003 | |
| 1004 if (x == ngx_queue_sentinel(locations)) { | |
| 1005 ngx_http_create_locations_list(&lq->list, ngx_queue_head(&lq->list)); | |
| 1006 return; | |
| 1007 } | |
| 1008 | |
| 1009 ngx_queue_split(&lq->list, x, &tail); | |
| 1010 ngx_queue_add(locations, &tail); | |
| 1011 | |
| 1012 ngx_http_create_locations_list(&lq->list, ngx_queue_head(&lq->list)); | |
| 1013 | |
| 1014 ngx_http_create_locations_list(locations, x); | |
| 1015 } | |
| 1016 | |
| 1017 | |
| 1018 /* | |
| 1019 * to keep cache locality for left leaf nodes, allocate nodes in following | |
| 1020 * order: node, left subtree, right subtree, inclusive subtree | |
| 1021 */ | |
| 1022 | |
| 1023 static ngx_http_location_tree_node_t * | |
| 1024 ngx_http_create_locations_tree(ngx_conf_t *cf, ngx_queue_t *locations, | |
| 1025 size_t prefix) | |
| 1026 { | |
| 1027 size_t len; | |
| 1028 ngx_queue_t *q, tail; | |
| 1029 ngx_http_location_queue_t *lq; | |
| 1030 ngx_http_location_tree_node_t *node; | |
| 1031 | |
| 1032 q = ngx_queue_middle(locations); | |
| 1033 | |
| 1034 lq = (ngx_http_location_queue_t *) q; | |
| 1035 len = lq->name->len - prefix; | |
| 1036 | |
| 2049 | 1037 node = ngx_palloc(cf->pool, |
| 1038 offsetof(ngx_http_location_tree_node_t, name) + len); | |
| 2027 | 1039 if (node == NULL) { |
| 1040 return NULL; | |
| 1041 } | |
| 1042 | |
|
2039
4d8140271204
*) add ngx_palloc_aligned() to allocate explicitlty aligned memory
Igor Sysoev <igor@sysoev.ru>
parents:
2029
diff
changeset
|
1043 node->left = NULL; |
|
4d8140271204
*) add ngx_palloc_aligned() to allocate explicitlty aligned memory
Igor Sysoev <igor@sysoev.ru>
parents:
2029
diff
changeset
|
1044 node->right = NULL; |
|
4d8140271204
*) add ngx_palloc_aligned() to allocate explicitlty aligned memory
Igor Sysoev <igor@sysoev.ru>
parents:
2029
diff
changeset
|
1045 node->tree = NULL; |
| 2027 | 1046 node->exact = lq->exact; |
| 1047 node->inclusive = lq->inclusive; | |
| 1048 | |
| 1049 node->auto_redirect = (u_char) ((lq->exact && lq->exact->auto_redirect) | |
| 1050 || (lq->inclusive && lq->inclusive->auto_redirect)); | |
| 1051 | |
| 1052 node->len = (u_char) len; | |
| 1053 ngx_memcpy(node->name, &lq->name->data[prefix], len); | |
| 1054 | |
| 1055 ngx_queue_split(locations, q, &tail); | |
| 1056 | |
| 1057 if (ngx_queue_empty(locations)) { | |
| 1058 /* | |
| 1059 * ngx_queue_split() insures that if left part is empty, | |
| 1060 * then right one is empty too | |
| 1061 */ | |
| 1062 goto inclusive; | |
| 1063 } | |
| 1064 | |
| 1065 node->left = ngx_http_create_locations_tree(cf, locations, prefix); | |
| 1066 if (node->left == NULL) { | |
| 1067 return NULL; | |
| 1068 } | |
| 1069 | |
| 1070 ngx_queue_remove(q); | |
| 1071 | |
| 1072 if (ngx_queue_empty(&tail)) { | |
| 1073 goto inclusive; | |
| 1074 } | |
| 1075 | |
| 1076 node->right = ngx_http_create_locations_tree(cf, &tail, prefix); | |
| 1077 if (node->right == NULL) { | |
| 1078 return NULL; | |
| 1079 } | |
| 1080 | |
| 1081 inclusive: | |
| 1082 | |
| 1083 if (ngx_queue_empty(&lq->list)) { | |
| 1084 return node; | |
| 1085 } | |
| 1086 | |
| 1087 node->tree = ngx_http_create_locations_tree(cf, &lq->list, prefix + len); | |
| 1088 if (node->tree == NULL) { | |
| 1089 return NULL; | |
| 1090 } | |
| 1091 | |
| 1092 return node; | |
| 1093 } | |
| 1094 | |
| 1095 | |
| 3217 | 1096 ngx_int_t |
| 1097 ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, | |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1098 ngx_http_listen_opt_t *lsopt) |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1099 { |
| 3217 | 1100 in_port_t p; |
| 1101 ngx_uint_t i; | |
| 1102 struct sockaddr *sa; | |
| 1103 struct sockaddr_in *sin; | |
| 1104 ngx_http_conf_port_t *port; | |
| 1105 ngx_http_core_main_conf_t *cmcf; | |
| 1106 #if (NGX_HAVE_INET6) | |
| 1107 struct sockaddr_in6 *sin6; | |
| 1108 #endif | |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1109 |
| 3217 | 1110 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1111 |
| 3217 | 1112 if (cmcf->ports == NULL) { |
| 1113 cmcf->ports = ngx_array_create(cf->temp_pool, 2, | |
| 1114 sizeof(ngx_http_conf_port_t)); | |
| 1115 if (cmcf->ports == NULL) { | |
| 1116 return NGX_ERROR; | |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1117 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1118 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1119 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1120 sa = (struct sockaddr *) &lsopt->sockaddr; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1121 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1122 switch (sa->sa_family) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1123 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1124 #if (NGX_HAVE_INET6) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1125 case AF_INET6: |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1126 sin6 = (struct sockaddr_in6 *) sa; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1127 p = sin6->sin6_port; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1128 break; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1129 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1130 |
|
3230
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1131 #if (NGX_HAVE_UNIX_DOMAIN) |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1132 case AF_UNIX: |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1133 p = 0; |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1134 break; |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1135 #endif |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1136 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1137 default: /* AF_INET */ |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1138 sin = (struct sockaddr_in *) sa; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1139 p = sin->sin_port; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1140 break; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1141 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1142 |
| 3217 | 1143 port = cmcf->ports->elts; |
| 1144 for (i = 0; i < cmcf->ports->nelts; i++) { | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1145 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1146 if (p != port[i].port || sa->sa_family != port[i].family) { |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1147 continue; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1148 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1149 |
|
2852
dfe04af9d30b
update comments missed in r2513
Igor Sysoev <igor@sysoev.ru>
parents:
2851
diff
changeset
|
1150 /* a port is already in the port list */ |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1151 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1152 return ngx_http_add_addresses(cf, cscf, &port[i], lsopt); |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1153 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1154 |
|
2852
dfe04af9d30b
update comments missed in r2513
Igor Sysoev <igor@sysoev.ru>
parents:
2851
diff
changeset
|
1155 /* add a port to the port list */ |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1156 |
| 3217 | 1157 port = ngx_array_push(cmcf->ports); |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1158 if (port == NULL) { |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1159 return NGX_ERROR; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1160 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1161 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1162 port->family = sa->sa_family; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1163 port->port = p; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1164 port->addrs.elts = NULL; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1165 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1166 return ngx_http_add_address(cf, cscf, port, lsopt); |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1167 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1168 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1169 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1170 static ngx_int_t |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1171 ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1172 ngx_http_conf_port_t *port, ngx_http_listen_opt_t *lsopt) |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1173 { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1174 u_char *p; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1175 size_t len, off; |
|
3229
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1176 ngx_uint_t i, default_server; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1177 struct sockaddr *sa; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1178 ngx_http_conf_addr_t *addr; |
|
3230
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1179 #if (NGX_HAVE_UNIX_DOMAIN) |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1180 struct sockaddr_un *saun; |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1181 #endif |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1182 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1183 /* |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1184 * we can not compare whole sockaddr struct's as kernel |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1185 * may fill some fields in inherited sockaddr struct's |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1186 */ |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1187 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1188 sa = (struct sockaddr *) &lsopt->sockaddr; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1189 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1190 switch (sa->sa_family) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1191 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1192 #if (NGX_HAVE_INET6) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1193 case AF_INET6: |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1194 off = offsetof(struct sockaddr_in6, sin6_addr); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1195 len = 16; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1196 break; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1197 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1198 |
|
3230
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1199 #if (NGX_HAVE_UNIX_DOMAIN) |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1200 case AF_UNIX: |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1201 off = offsetof(struct sockaddr_un, sun_path); |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1202 len = sizeof(saun->sun_path); |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1203 break; |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1204 #endif |
|
a7491af45540
http listen unix domain sockets
Igor Sysoev <igor@sysoev.ru>
parents:
3229
diff
changeset
|
1205 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1206 default: /* AF_INET */ |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1207 off = offsetof(struct sockaddr_in, sin_addr); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1208 len = 4; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1209 break; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1210 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1211 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1212 p = lsopt->sockaddr + off; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1213 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1214 addr = port->addrs.elts; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1215 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1216 for (i = 0; i < port->addrs.nelts; i++) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1217 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1218 if (ngx_memcmp(p, (u_char *) addr[i].opt.sockaddr + off, len) != 0) { |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1219 continue; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1220 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1221 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1222 /* the address is already in the address list */ |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1223 |
| 3219 | 1224 if (ngx_http_add_server(cf, cscf, &addr[i]) != NGX_OK) { |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1225 return NGX_ERROR; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1226 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1227 |
|
3229
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1228 /* preserve default_server bit during listen options overwriting */ |
|
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1229 default_server = addr[i].opt.default_server; |
|
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1230 |
|
3226
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1231 if (lsopt->set) { |
|
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1232 |
|
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1233 if (addr[i].opt.set) { |
|
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1234 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3224
8e76e636ae3b
allow to set listen options in any server
Igor Sysoev <igor@sysoev.ru>
parents:
3223
diff
changeset
|
1235 "a duplicate listen options for %s", addr[i].opt.addr); |
|
3226
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1236 return NGX_ERROR; |
|
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1237 } |
|
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1238 |
|
4872f86df719
fix r3225: it overrode the listen options by default server default options
Igor Sysoev <igor@sysoev.ru>
parents:
3224
diff
changeset
|
1239 addr[i].opt = *lsopt; |
|
3224
8e76e636ae3b
allow to set listen options in any server
Igor Sysoev <igor@sysoev.ru>
parents:
3223
diff
changeset
|
1240 } |
|
8e76e636ae3b
allow to set listen options in any server
Igor Sysoev <igor@sysoev.ru>
parents:
3223
diff
changeset
|
1241 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1242 /* check the duplicate "default" server for this address:port */ |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1243 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1244 if (lsopt->default_server) { |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1245 |
|
3229
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1246 if (default_server) { |
| 3217 | 1247 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3223
bfcc1a6dd184
add listen address in error message
Igor Sysoev <igor@sysoev.ru>
parents:
3221
diff
changeset
|
1248 "a duplicate default server for %s", addr[i].opt.addr); |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1249 return NGX_ERROR; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1250 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1251 |
|
3229
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1252 default_server = 1; |
|
3221
c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
1253 addr[i].default_server = cscf; |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1254 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1255 |
|
3229
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1256 addr[i].opt.default_server = default_server; |
|
a632dc9f3e73
fix r3225 and r3227: preserve default_server bit during listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3227
diff
changeset
|
1257 |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1258 return NGX_OK; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1259 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1260 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1261 /* add the address to the addresses list that bound to this port */ |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1262 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1263 return ngx_http_add_address(cf, cscf, port, lsopt); |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1264 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1265 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1266 |
| 455 | 1267 /* |
| 1268 * add the server address, the server names and the server core module | |
|
2852
dfe04af9d30b
update comments missed in r2513
Igor Sysoev <igor@sysoev.ru>
parents:
2851
diff
changeset
|
1269 * configurations to the port list |
| 455 | 1270 */ |
| 1271 | |
| 499 | 1272 static ngx_int_t |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1273 ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1274 ngx_http_conf_port_t *port, ngx_http_listen_opt_t *lsopt) |
| 455 | 1275 { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1276 ngx_http_conf_addr_t *addr; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1277 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1278 if (port->addrs.elts == NULL) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1279 if (ngx_array_init(&port->addrs, cf->temp_pool, 4, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1280 sizeof(ngx_http_conf_addr_t)) |
| 1385 | 1281 != NGX_OK) |
| 455 | 1282 { |
| 1283 return NGX_ERROR; | |
| 1284 } | |
| 1285 } | |
| 1286 | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1287 addr = ngx_array_push(&port->addrs); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1288 if (addr == NULL) { |
| 455 | 1289 return NGX_ERROR; |
| 1290 } | |
| 1291 | |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1292 addr->opt = *lsopt; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1293 addr->hash.buckets = NULL; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1294 addr->hash.size = 0; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1295 addr->wc_head = NULL; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1296 addr->wc_tail = NULL; |
| 1387 | 1297 #if (NGX_PCRE) |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1298 addr->nregex = 0; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1299 addr->regex = NULL; |
| 1387 | 1300 #endif |
|
3221
c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
1301 addr->default_server = cscf; |
| 3219 | 1302 addr->servers.elts = NULL; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1303 |
| 3219 | 1304 return ngx_http_add_server(cf, cscf, addr); |
| 455 | 1305 } |
| 1306 | |
| 1307 | |
| 3219 | 1308 /* add the server core module configuration to the address:port */ |
| 455 | 1309 |
| 499 | 1310 static ngx_int_t |
| 3219 | 1311 ngx_http_add_server(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1312 ngx_http_conf_addr_t *addr) |
| 455 | 1313 { |
|
3227
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1314 ngx_uint_t i; |
| 3219 | 1315 ngx_http_core_srv_conf_t **server; |
| 455 | 1316 |
| 3219 | 1317 if (addr->servers.elts == NULL) { |
| 1318 if (ngx_array_init(&addr->servers, cf->temp_pool, 4, | |
| 1319 sizeof(ngx_http_core_srv_conf_t *)) | |
| 1385 | 1320 != NGX_OK) |
| 477 | 1321 { |
| 1322 return NGX_ERROR; | |
| 1323 } | |
|
3227
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1324 |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1325 } else { |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1326 server = addr->servers.elts; |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1327 for (i = 0; i < addr->servers.nelts; i++) { |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1328 if (server[i] == cscf) { |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1329 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1330 "a duplicate listen %s", addr->opt.addr); |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1331 return NGX_ERROR; |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1332 } |
|
a610008bdc1a
test a duplicate listen in a server
Igor Sysoev <igor@sysoev.ru>
parents:
3226
diff
changeset
|
1333 } |
| 477 | 1334 } |
| 1335 | |
| 3219 | 1336 server = ngx_array_push(&addr->servers); |
| 1337 if (server == NULL) { | |
| 1338 return NGX_ERROR; | |
| 1339 } | |
| 477 | 1340 |
| 3219 | 1341 *server = cscf; |
| 455 | 1342 |
| 1343 return NGX_OK; | |
| 1344 } | |
| 1345 | |
| 1346 | |
|
1956
cb8c0c8e0c27
use ngx_int_t in ngx_sort() callback
Igor Sysoev <igor@sysoev.ru>
parents:
1910
diff
changeset
|
1347 static ngx_int_t |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1348 ngx_http_optimize_servers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1349 ngx_array_t *ports) |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1350 { |
| 3219 | 1351 ngx_uint_t p, a; |
| 1352 ngx_http_conf_port_t *port; | |
| 1353 ngx_http_conf_addr_t *addr; | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1354 |
|
3257
8bd88de8fecd
fix segfault if http {} block is empty, the bug had been introduced in r3218
Igor Sysoev <igor@sysoev.ru>
parents:
3230
diff
changeset
|
1355 if (ports == NULL) { |
|
8bd88de8fecd
fix segfault if http {} block is empty, the bug had been introduced in r3218
Igor Sysoev <igor@sysoev.ru>
parents:
3230
diff
changeset
|
1356 return NGX_OK; |
|
8bd88de8fecd
fix segfault if http {} block is empty, the bug had been introduced in r3218
Igor Sysoev <igor@sysoev.ru>
parents:
3230
diff
changeset
|
1357 } |
|
8bd88de8fecd
fix segfault if http {} block is empty, the bug had been introduced in r3218
Igor Sysoev <igor@sysoev.ru>
parents:
3230
diff
changeset
|
1358 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1359 port = ports->elts; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1360 for (p = 0; p < ports->nelts; p++) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1361 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1362 ngx_sort(port[p].addrs.elts, (size_t) port[p].addrs.nelts, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1363 sizeof(ngx_http_conf_addr_t), ngx_http_cmp_conf_addrs); |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1364 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1365 /* |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1366 * check whether all name-based servers have the same |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1367 * configuraiton as a default server for given address:port |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1368 */ |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1369 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1370 addr = port[p].addrs.elts; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1371 for (a = 0; a < port[p].addrs.nelts; a++) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1372 |
| 3219 | 1373 if (addr[a].servers.nelts > 1 |
|
2583
1fb5e7e05a4e
always run regex in server_name to get captures
Igor Sysoev <igor@sysoev.ru>
parents:
2580
diff
changeset
|
1374 #if (NGX_PCRE) |
|
3221
c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
1375 || addr[a].default_server->captures |
|
2583
1fb5e7e05a4e
always run regex in server_name to get captures
Igor Sysoev <igor@sysoev.ru>
parents:
2580
diff
changeset
|
1376 #endif |
| 3219 | 1377 ) |
| 1378 { | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1379 if (ngx_http_server_names(cf, cmcf, &addr[a]) != NGX_OK) { |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1380 return NGX_ERROR; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1381 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1382 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1383 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1384 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1385 if (ngx_http_init_listening(cf, &port[p]) != NGX_OK) { |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1386 return NGX_ERROR; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1387 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1388 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1389 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1390 return NGX_OK; |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1391 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1392 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1393 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1394 static ngx_int_t |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1395 ngx_http_server_names(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf, |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1396 ngx_http_conf_addr_t *addr) |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1397 { |
| 3219 | 1398 ngx_int_t rc; |
| 1399 ngx_uint_t n, s; | |
| 1400 ngx_hash_init_t hash; | |
| 1401 ngx_hash_keys_arrays_t ha; | |
| 1402 ngx_http_server_name_t *name; | |
| 1403 ngx_http_core_srv_conf_t **cscfp; | |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1404 #if (NGX_PCRE) |
| 3219 | 1405 ngx_uint_t regex, i; |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1406 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1407 regex = 0; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1408 #endif |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1409 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1410 ngx_memzero(&ha, sizeof(ngx_hash_keys_arrays_t)); |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1411 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1412 ha.temp_pool = ngx_create_pool(16384, cf->log); |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1413 if (ha.temp_pool == NULL) { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1414 return NGX_ERROR; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1415 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1416 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1417 ha.pool = cf->pool; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1418 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1419 if (ngx_hash_keys_array_init(&ha, NGX_HASH_LARGE) != NGX_OK) { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1420 goto failed; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1421 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1422 |
| 3219 | 1423 cscfp = addr->servers.elts; |
| 1424 | |
| 1425 for (s = 0; s < addr->servers.nelts; s++) { | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1426 |
| 3219 | 1427 name = cscfp[s]->server_names.elts; |
| 1428 | |
| 1429 for (n = 0; n < cscfp[s]->server_names.nelts; n++) { | |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1430 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1431 #if (NGX_PCRE) |
| 3219 | 1432 if (name[n].regex) { |
| 1433 regex++; | |
| 1434 continue; | |
| 1435 } | |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1436 #endif |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1437 |
|
3221
c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
1438 rc = ngx_hash_add_key(&ha, &name[n].name, name[n].server, |
| 3219 | 1439 NGX_HASH_WILDCARD_KEY); |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1440 |
| 3219 | 1441 if (rc == NGX_ERROR) { |
| 1442 return NGX_ERROR; | |
| 1443 } | |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1444 |
| 3219 | 1445 if (rc == NGX_DECLINED) { |
| 1446 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 1447 "invalid server name or wildcard \"%V\" on %s", | |
| 1448 &name[n].name, addr->opt.addr); | |
| 1449 return NGX_ERROR; | |
| 1450 } | |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1451 |
| 3219 | 1452 if (rc == NGX_BUSY) { |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1453 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
| 3219 | 1454 "conflicting server name \"%V\" on %s, ignored", |
| 1455 &name[n].name, addr->opt.addr); | |
| 1456 } | |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1457 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1458 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1459 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1460 hash.key = ngx_hash_key_lc; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1461 hash.max_size = cmcf->server_names_hash_max_size; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1462 hash.bucket_size = cmcf->server_names_hash_bucket_size; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1463 hash.name = "server_names_hash"; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1464 hash.pool = cf->pool; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1465 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1466 if (ha.keys.nelts) { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1467 hash.hash = &addr->hash; |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1468 hash.temp_pool = NULL; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1469 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1470 if (ngx_hash_init(&hash, ha.keys.elts, ha.keys.nelts) != NGX_OK) { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1471 goto failed; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1472 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1473 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1474 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1475 if (ha.dns_wc_head.nelts) { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1476 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1477 ngx_qsort(ha.dns_wc_head.elts, (size_t) ha.dns_wc_head.nelts, |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1478 sizeof(ngx_hash_key_t), ngx_http_cmp_dns_wildcards); |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1479 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1480 hash.hash = NULL; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1481 hash.temp_pool = ha.temp_pool; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1482 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1483 if (ngx_hash_wildcard_init(&hash, ha.dns_wc_head.elts, |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1484 ha.dns_wc_head.nelts) |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1485 != NGX_OK) |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1486 { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1487 goto failed; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1488 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1489 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1490 addr->wc_head = (ngx_hash_wildcard_t *) hash.hash; |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1491 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1492 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1493 if (ha.dns_wc_tail.nelts) { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1494 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1495 ngx_qsort(ha.dns_wc_tail.elts, (size_t) ha.dns_wc_tail.nelts, |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1496 sizeof(ngx_hash_key_t), ngx_http_cmp_dns_wildcards); |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1497 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1498 hash.hash = NULL; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1499 hash.temp_pool = ha.temp_pool; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1500 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1501 if (ngx_hash_wildcard_init(&hash, ha.dns_wc_tail.elts, |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1502 ha.dns_wc_tail.nelts) |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1503 != NGX_OK) |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1504 { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1505 goto failed; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1506 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1507 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1508 addr->wc_tail = (ngx_hash_wildcard_t *) hash.hash; |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1509 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1510 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1511 ngx_destroy_pool(ha.temp_pool); |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1512 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1513 #if (NGX_PCRE) |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1514 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1515 if (regex == 0) { |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1516 return NGX_OK; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1517 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1518 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1519 addr->nregex = regex; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1520 addr->regex = ngx_palloc(cf->pool, regex * sizeof(ngx_http_server_name_t)); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1521 if (addr->regex == NULL) { |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1522 return NGX_ERROR; |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1523 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1524 |
| 3219 | 1525 i = 0; |
| 1526 | |
| 1527 for (s = 0; s < addr->servers.nelts; s++) { | |
| 1528 | |
| 1529 name = cscfp[s]->server_names.elts; | |
| 1530 | |
| 1531 for (n = 0; n < cscfp[s]->server_names.nelts; n++) { | |
| 1532 if (name[n].regex) { | |
| 1533 addr->regex[i++] = name[n]; | |
| 1534 } | |
|
2511
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1535 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1536 } |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1537 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1538 #endif |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1539 |
|
f91c5c964e61
split ports, addresses, and server names preparation and optimization
Igor Sysoev <igor@sysoev.ru>
parents:
2407
diff
changeset
|
1540 return NGX_OK; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1541 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1542 failed: |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1543 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1544 ngx_destroy_pool(ha.temp_pool); |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1545 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1546 return NGX_ERROR; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1547 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1548 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1549 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1550 static ngx_int_t |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1551 ngx_http_cmp_conf_addrs(const void *one, const void *two) |
| 593 | 1552 { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1553 ngx_http_conf_addr_t *first, *second; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1554 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1555 first = (ngx_http_conf_addr_t *) one; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1556 second = (ngx_http_conf_addr_t *) two; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1557 |
|
3218
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1558 if (first->opt.wildcard) { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1559 /* a wildcard address must be the last resort, shift it to the end */ |
| 593 | 1560 return 1; |
| 1561 } | |
| 1562 | |
|
3218
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1563 if (first->opt.bind && !second->opt.bind) { |
| 593 | 1564 /* shift explicit bind()ed addresses to the start */ |
| 1565 return -1; | |
| 1566 } | |
| 1567 | |
|
3218
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1568 if (!first->opt.bind && second->opt.bind) { |
| 593 | 1569 /* shift explicit bind()ed addresses to the start */ |
| 1570 return 1; | |
| 1571 } | |
| 1572 | |
| 1573 /* do not sort by default */ | |
| 1574 | |
| 1575 return 0; | |
| 1576 } | |
| 1577 | |
| 1578 | |
| 1579 static int ngx_libc_cdecl | |
| 1580 ngx_http_cmp_dns_wildcards(const void *one, const void *two) | |
| 1581 { | |
| 1582 ngx_hash_key_t *first, *second; | |
| 1583 | |
| 1584 first = (ngx_hash_key_t *) one; | |
| 1585 second = (ngx_hash_key_t *) two; | |
| 1586 | |
|
3116
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
2852
diff
changeset
|
1587 return ngx_dns_strcmp(first->key.data, second->key.data); |
| 593 | 1588 } |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1589 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1590 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1591 static ngx_int_t |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1592 ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_port_t *port) |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1593 { |
| 2533 | 1594 ngx_uint_t i, last, bind_wildcard; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1595 ngx_listening_t *ls; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1596 ngx_http_port_t *hport; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1597 ngx_http_conf_addr_t *addr; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1598 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1599 addr = port->addrs.elts; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1600 last = port->addrs.nelts; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1601 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1602 /* |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1603 * If there is a binding to an "*:port" then we need to bind() to |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1604 * the "*:port" only and ignore other implicit bindings. The bindings |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1605 * have been already sorted: explicit bindings are on the start, then |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1606 * implicit bindings go, and wildcard binding is in the end. |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1607 */ |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1608 |
|
3218
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1609 if (addr[last - 1].opt.wildcard) { |
|
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1610 addr[last - 1].opt.bind = 1; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1611 bind_wildcard = 1; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1612 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1613 } else { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1614 bind_wildcard = 0; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1615 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1616 |
| 2533 | 1617 i = 0; |
| 1618 | |
| 1619 while (i < last) { | |
| 1620 | |
|
3218
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1621 if (bind_wildcard && !addr[i].opt.bind) { |
| 2533 | 1622 i++; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1623 continue; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1624 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1625 |
| 2533 | 1626 ls = ngx_http_add_listening(cf, &addr[i]); |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1627 if (ls == NULL) { |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1628 return NGX_ERROR; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1629 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1630 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1631 hport = ngx_pcalloc(cf->pool, sizeof(ngx_http_port_t)); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1632 if (hport == NULL) { |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1633 return NGX_ERROR; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1634 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1635 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1636 ls->servers = hport; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1637 |
| 2533 | 1638 if (i == last - 1) { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1639 hport->naddrs = last; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1640 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1641 } else { |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1642 hport->naddrs = 1; |
| 2533 | 1643 i = 0; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1644 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1645 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1646 switch (ls->sockaddr->sa_family) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1647 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1648 #if (NGX_HAVE_INET6) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1649 case AF_INET6: |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1650 if (ngx_http_add_addrs6(cf, hport, addr) != NGX_OK) { |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1651 return NGX_ERROR; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1652 } |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1653 break; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1654 #endif |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1655 default: /* AF_INET */ |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1656 if (ngx_http_add_addrs(cf, hport, addr) != NGX_OK) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1657 return NGX_ERROR; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1658 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1659 break; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1660 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1661 |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1662 addr++; |
|
2022
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1663 last--; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1664 } |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1665 |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1666 return NGX_OK; |
|
35b35b84f5ef
split ngx_http_block() further
Igor Sysoev <igor@sysoev.ru>
parents:
2021
diff
changeset
|
1667 } |
| 2138 | 1668 |
| 1669 | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1670 static ngx_listening_t * |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1671 ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1672 { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1673 ngx_listening_t *ls; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1674 ngx_http_core_loc_conf_t *clcf; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1675 ngx_http_core_srv_conf_t *cscf; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1676 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1677 ls = ngx_create_listening(cf, addr->opt.sockaddr, addr->opt.socklen); |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1678 if (ls == NULL) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1679 return NULL; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1680 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1681 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1682 ls->addr_ntop = 1; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1683 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1684 ls->handler = ngx_http_init_connection; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1685 |
|
3221
c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
1686 cscf = addr->default_server; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1687 ls->pool_size = cscf->connection_pool_size; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1688 ls->post_accept_timeout = cscf->client_header_timeout; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1689 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1690 clcf = cscf->ctx->loc_conf[ngx_http_core_module.ctx_index]; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1691 |
|
2785
d478379e51ac
*) refactor error_log processing: listen socket log might inherit built-in
Igor Sysoev <igor@sysoev.ru>
parents:
2689
diff
changeset
|
1692 ls->logp = clcf->error_log; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1693 ls->log.data = &ls->addr_text; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1694 ls->log.handler = ngx_accept_log_error; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1695 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1696 #if (NGX_WIN32) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1697 { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1698 ngx_iocp_conf_t *iocpcf; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1699 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1700 iocpcf = ngx_event_get_conf(cf->cycle->conf_ctx, ngx_iocp_module); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1701 if (iocpcf->acceptex_read) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1702 ls->post_accept_buffer_size = cscf->client_header_buffer_size; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1703 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1704 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1705 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1706 |
| 3217 | 1707 ls->backlog = addr->opt.backlog; |
| 1708 ls->rcvbuf = addr->opt.rcvbuf; | |
| 1709 ls->sndbuf = addr->opt.sndbuf; | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1710 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1711 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) |
| 3217 | 1712 ls->accept_filter = addr->opt.accept_filter; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1713 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1714 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1715 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) |
| 3217 | 1716 ls->deferred_accept = addr->opt.deferred_accept; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1717 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1718 |
| 2562 | 1719 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) |
| 3217 | 1720 ls->ipv6only = addr->opt.ipv6only; |
| 2562 | 1721 #endif |
| 1722 | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1723 return ls; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1724 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1725 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1726 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1727 static ngx_int_t |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1728 ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1729 ngx_http_conf_addr_t *addr) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1730 { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1731 ngx_uint_t i; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1732 ngx_http_in_addr_t *addrs; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1733 struct sockaddr_in *sin; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1734 ngx_http_virtual_names_t *vn; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1735 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1736 hport->addrs = ngx_pcalloc(cf->pool, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1737 hport->naddrs * sizeof(ngx_http_in_addr_t)); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1738 if (hport->addrs == NULL) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1739 return NGX_ERROR; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1740 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1741 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1742 addrs = hport->addrs; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1743 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1744 for (i = 0; i < hport->naddrs; i++) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1745 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1746 sin = (struct sockaddr_in *) addr[i].opt.sockaddr; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1747 addrs[i].addr = sin->sin_addr.s_addr; |
|
3221
c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
1748 addrs[i].conf.default_server = addr[i].default_server; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1749 #if (NGX_HTTP_SSL) |
|
3218
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1750 addrs[i].conf.ssl = addr[i].opt.ssl; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1751 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1752 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1753 if (addr[i].hash.buckets == NULL |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1754 && (addr[i].wc_head == NULL |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1755 || addr[i].wc_head->hash.buckets == NULL) |
|
2580
684ca3b0ae14
test wildcard tail hash existance
Igor Sysoev <igor@sysoev.ru>
parents:
2562
diff
changeset
|
1756 && (addr[i].wc_tail == NULL |
|
2583
1fb5e7e05a4e
always run regex in server_name to get captures
Igor Sysoev <igor@sysoev.ru>
parents:
2580
diff
changeset
|
1757 || addr[i].wc_tail->hash.buckets == NULL) |
|
1fb5e7e05a4e
always run regex in server_name to get captures
Igor Sysoev <igor@sysoev.ru>
parents:
2580
diff
changeset
|
1758 #if (NGX_PCRE) |
|
1fb5e7e05a4e
always run regex in server_name to get captures
Igor Sysoev <igor@sysoev.ru>
parents:
2580
diff
changeset
|
1759 && addr[i].nregex == 0 |
|
1fb5e7e05a4e
always run regex in server_name to get captures
Igor Sysoev <igor@sysoev.ru>
parents:
2580
diff
changeset
|
1760 #endif |
|
1fb5e7e05a4e
always run regex in server_name to get captures
Igor Sysoev <igor@sysoev.ru>
parents:
2580
diff
changeset
|
1761 ) |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1762 { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1763 continue; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1764 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1765 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1766 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1767 if (vn == NULL) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1768 return NGX_ERROR; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1769 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1770 |
|
2689
6caf687a831f
backout r2535: virtual names is a property of address:port pair,
Igor Sysoev <igor@sysoev.ru>
parents:
2688
diff
changeset
|
1771 addrs[i].conf.virtual_names = vn; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1772 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1773 vn->names.hash = addr[i].hash; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1774 vn->names.wc_head = addr[i].wc_head; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1775 vn->names.wc_tail = addr[i].wc_tail; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1776 #if (NGX_PCRE) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1777 vn->nregex = addr[i].nregex; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1778 vn->regex = addr[i].regex; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1779 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1780 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1781 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1782 return NGX_OK; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1783 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1784 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1785 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1786 #if (NGX_HAVE_INET6) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1787 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1788 static ngx_int_t |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1789 ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1790 ngx_http_conf_addr_t *addr) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1791 { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1792 ngx_uint_t i; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1793 ngx_http_in6_addr_t *addrs6; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1794 struct sockaddr_in6 *sin6; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1795 ngx_http_virtual_names_t *vn; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1796 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1797 hport->addrs = ngx_pcalloc(cf->pool, |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1798 hport->naddrs * sizeof(ngx_http_in6_addr_t)); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1799 if (hport->addrs == NULL) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1800 return NGX_ERROR; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1801 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1802 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1803 addrs6 = hport->addrs; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1804 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1805 for (i = 0; i < hport->naddrs; i++) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1806 |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3219
diff
changeset
|
1807 sin6 = (struct sockaddr_in6 *) addr[i].opt.sockaddr; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1808 addrs6[i].addr6 = sin6->sin6_addr; |
|
3221
c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
1809 addrs6[i].conf.default_server = addr[i].default_server; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1810 #if (NGX_HTTP_SSL) |
|
3218
022a7662b4ed
refactor http listen code: remove duplicate options fields
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
1811 addrs6[i].conf.ssl = addr[i].opt.ssl; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1812 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1813 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1814 if (addr[i].hash.buckets == NULL |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1815 && (addr[i].wc_head == NULL |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1816 || addr[i].wc_head->hash.buckets == NULL) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1817 && (addr[i].wc_head == NULL |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1818 || addr[i].wc_head->hash.buckets == NULL)) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1819 { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1820 continue; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1821 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1822 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1823 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1824 if (vn == NULL) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1825 return NGX_ERROR; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1826 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1827 |
|
2689
6caf687a831f
backout r2535: virtual names is a property of address:port pair,
Igor Sysoev <igor@sysoev.ru>
parents:
2688
diff
changeset
|
1828 addrs6[i].conf.virtual_names = vn; |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1829 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1830 vn->names.hash = addr[i].hash; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1831 vn->names.wc_head = addr[i].wc_head; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1832 vn->names.wc_tail = addr[i].wc_tail; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1833 #if (NGX_PCRE) |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1834 vn->nregex = addr[i].nregex; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1835 vn->regex = addr[i].regex; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1836 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1837 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1838 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1839 return NGX_OK; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1840 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1841 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1842 #endif |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1843 |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2511
diff
changeset
|
1844 |
| 2138 | 1845 char * |
| 1846 ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1847 { | |
| 1848 char *p = conf; | |
| 1849 | |
| 1850 ngx_array_t **types; | |
| 1851 ngx_str_t *value, *default_type; | |
| 1852 ngx_uint_t i, n, hash; | |
| 1853 ngx_hash_key_t *type; | |
| 1854 | |
| 1855 types = (ngx_array_t **) (p + cmd->offset); | |
| 1856 | |
| 1857 default_type = cmd->post; | |
| 1858 | |
| 1859 if (*types == NULL) { | |
| 1860 *types = ngx_array_create(cf->temp_pool, 1, sizeof(ngx_hash_key_t)); | |
| 1861 if (*types == NULL) { | |
| 1862 return NGX_CONF_ERROR; | |
| 1863 } | |
| 1864 | |
| 1865 if (default_type) { | |
| 1866 type = ngx_array_push(*types); | |
| 1867 if (type == NULL) { | |
| 1868 return NGX_CONF_ERROR; | |
| 1869 } | |
| 1870 | |
| 1871 type->key = *default_type; | |
| 1872 type->key_hash = ngx_hash_key(default_type->data, | |
| 1873 default_type->len); | |
| 1874 type->value = (void *) 4; | |
| 1875 } | |
| 1876 } | |
| 1877 | |
| 1878 value = cf->args->elts; | |
| 1879 | |
| 1880 for (i = 1; i < cf->args->nelts; i++) { | |
| 1881 | |
| 1882 hash = ngx_hash_strlow(value[i].data, value[i].data, value[i].len); | |
| 1883 value[i].data[value[i].len] = '\0'; | |
| 1884 | |
| 1885 type = (*types)->elts; | |
| 1886 for (n = 0; n < (*types)->nelts; n++) { | |
| 1887 | |
| 1888 if (ngx_strcmp(value[i].data, type[n].key.data) == 0) { | |
| 1889 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 1890 "duplicate MIME type \"%V\"", &value[i]); | |
| 1891 continue; | |
| 1892 } | |
| 1893 } | |
| 1894 | |
| 1895 type = ngx_array_push(*types); | |
| 1896 if (type == NULL) { | |
| 1897 return NGX_CONF_ERROR; | |
| 1898 } | |
| 1899 | |
| 1900 type->key = value[i]; | |
| 1901 type->key_hash = hash; | |
| 1902 type->value = (void *) 4; | |
| 1903 } | |
| 1904 | |
| 1905 return NGX_CONF_OK; | |
| 1906 } | |
| 1907 | |
| 1908 | |
| 1909 char * | |
| 1910 ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t *keys, ngx_hash_t *types_hash, | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1911 ngx_array_t *prev_keys, ngx_hash_t *prev_types_hash, |
| 2138 | 1912 ngx_str_t *default_types) |
| 1913 { | |
| 1914 ngx_hash_init_t hash; | |
| 1915 | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1916 if (keys) { |
| 2138 | 1917 |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1918 hash.hash = types_hash; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1919 hash.key = NULL; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1920 hash.max_size = 2048; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1921 hash.bucket_size = 64; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1922 hash.name = "test_types_hash"; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1923 hash.pool = cf->pool; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1924 hash.temp_pool = NULL; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1925 |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1926 if (ngx_hash_init(&hash, keys->elts, keys->nelts) != NGX_OK) { |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1927 return NGX_CONF_ERROR; |
| 2138 | 1928 } |
| 1929 | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1930 return NGX_CONF_OK; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1931 } |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1932 |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1933 if (prev_types_hash->buckets == NULL) { |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1934 |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1935 if (prev_keys == NULL) { |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1936 |
|
2223
005fc65f7ce7
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
2219
diff
changeset
|
1937 if (ngx_http_set_default_types(cf, &prev_keys, default_types) |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1938 != NGX_OK) |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1939 { |
|
2223
005fc65f7ce7
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
2219
diff
changeset
|
1940 return NGX_CONF_ERROR; |
|
005fc65f7ce7
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
2219
diff
changeset
|
1941 } |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1942 } |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1943 |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1944 hash.hash = prev_types_hash; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1945 hash.key = NULL; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1946 hash.max_size = 2048; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1947 hash.bucket_size = 64; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1948 hash.name = "test_types_hash"; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1949 hash.pool = cf->pool; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1950 hash.temp_pool = NULL; |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1951 |
|
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1952 if (ngx_hash_init(&hash, prev_keys->elts, prev_keys->nelts) != NGX_OK) { |
| 2138 | 1953 return NGX_CONF_ERROR; |
| 1954 } | |
| 1955 } | |
| 1956 | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1957 *types_hash = *prev_types_hash; |
| 2138 | 1958 |
| 1959 return NGX_CONF_OK; | |
| 1960 | |
| 1961 } | |
| 1962 | |
| 1963 | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1964 ngx_int_t |
| 2138 | 1965 ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, |
| 1966 ngx_str_t *default_type) | |
| 1967 { | |
| 1968 ngx_hash_key_t *type; | |
| 1969 | |
| 1970 *types = ngx_array_create(cf->temp_pool, 1, sizeof(ngx_hash_key_t)); | |
| 1971 if (*types == NULL) { | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1972 return NGX_ERROR; |
| 2138 | 1973 } |
| 1974 | |
| 1975 while (default_type->len) { | |
| 1976 | |
| 1977 type = ngx_array_push(*types); | |
| 1978 if (type == NULL) { | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1979 return NGX_ERROR; |
| 2138 | 1980 } |
| 1981 | |
| 1982 type->key = *default_type; | |
| 1983 type->key_hash = ngx_hash_key(default_type->data, | |
| 1984 default_type->len); | |
| 1985 type->value = (void *) 4; | |
| 1986 | |
| 1987 default_type++; | |
| 1988 } | |
| 1989 | |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
1990 return NGX_OK; |
| 2138 | 1991 } |