comparison src/http/ngx_http_core_module.h @ 1387:cb8b30ef3e7e

regex in server_name
author Igor Sysoev <igor@sysoev.ru>
date Sun, 12 Aug 2007 19:48:12 +0000
parents 7443fbe0b013
children f497ed7682a7
comparison
equal deleted inserted replaced
1386:3c6da0610f19 1387:cb8b30ef3e7e
149 /* list of structures to find core_srv_conf quickly at run time */ 149 /* list of structures to find core_srv_conf quickly at run time */
150 150
151 151
152 typedef struct { 152 typedef struct {
153 in_addr_t addr; 153 in_addr_t addr;
154
154 /* the default server configuration for this address:port */ 155 /* the default server configuration for this address:port */
155 ngx_http_core_srv_conf_t *core_srv_conf; 156 ngx_http_core_srv_conf_t *core_srv_conf;
157
156 ngx_http_virtual_names_t *virtual_names; 158 ngx_http_virtual_names_t *virtual_names;
157 } ngx_http_in_addr_t; 159 } ngx_http_in_addr_t;
158 160
159 161
160 typedef struct { 162 typedef struct {
178 ngx_hash_wildcard_t *wc_head; 180 ngx_hash_wildcard_t *wc_head;
179 ngx_hash_wildcard_t *wc_tail; 181 ngx_hash_wildcard_t *wc_tail;
180 182
181 ngx_array_t names; /* array of ngx_http_server_name_t */ 183 ngx_array_t names; /* array of ngx_http_server_name_t */
182 184
185 #if (NGX_PCRE)
186 ngx_uint_t nregex;
187 ngx_http_server_name_t *regex;
188
189 #endif
190
183 /* the default server configuration for this address:port */ 191 /* the default server configuration for this address:port */
184 ngx_http_core_srv_conf_t *core_srv_conf; 192 ngx_http_core_srv_conf_t *core_srv_conf;
185 193
186 unsigned default_server:1; 194 unsigned default_server:1;
187 unsigned bind:1; 195 unsigned bind:1;
188 196
189 ngx_http_listen_conf_t *listen_conf; 197 ngx_http_listen_conf_t *listen_conf;
190 } ngx_http_conf_in_addr_t; 198 } ngx_http_conf_in_addr_t;
191 199
192 200
193 typedef struct { 201 struct ngx_http_server_name_s {
202 #if (NGX_PCRE)
203 ngx_regex_t *regex;
204 #endif
205 ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */
194 ngx_str_t name; 206 ngx_str_t name;
195 ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */ 207 };
196 } ngx_http_server_name_t;
197 208
198 209
199 typedef struct { 210 typedef struct {
200 ngx_int_t status; 211 ngx_int_t status;
201 ngx_int_t overwrite; 212 ngx_int_t overwrite;