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