Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.h @ 1618:fbf94b8341bf stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1386, r1388, r1389, r1580, r1581 merge: regex in server_name and valid_referers
author Igor Sysoev <igor@sysoev.ru>
date Wed, 07 Nov 2007 13:46:29 +0000
parents cacb565c554e
children 3b7262e720c1
comparison
equal deleted inserted replaced
1617:cacb565c554e 1618:fbf94b8341bf
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 #endif
189
183 /* the default server configuration for this address:port */ 190 /* the default server configuration for this address:port */
184 ngx_http_core_srv_conf_t *core_srv_conf; 191 ngx_http_core_srv_conf_t *core_srv_conf;
185 192
186 unsigned default_server:1; 193 unsigned default_server:1;
187 unsigned bind:1; 194 unsigned bind:1;
188 195
189 ngx_http_listen_conf_t *listen_conf; 196 ngx_http_listen_conf_t *listen_conf;
190 } ngx_http_conf_in_addr_t; 197 } ngx_http_conf_in_addr_t;
191 198
192 199
193 typedef struct { 200 struct ngx_http_server_name_s {
201 #if (NGX_PCRE)
202 ngx_regex_t *regex;
203 #endif
204 ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */
194 ngx_str_t name; 205 ngx_str_t name;
195 ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */ 206 };
196 } ngx_http_server_name_t;
197 207
198 208
199 typedef struct { 209 typedef struct {
200 ngx_int_t status; 210 ngx_int_t status;
201 ngx_int_t overwrite; 211 ngx_int_t overwrite;