Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.h @ 3221:c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 21 Oct 2009 16:52:10 +0000 |
parents | cdcd9e29c589 |
children | 8e76e636ae3b |
comparison
equal
deleted
inserted
replaced
3220:cdcd9e29c589 | 3221:c8de5a8b6d17 |
---|---|
175 /* list of structures to find core_srv_conf quickly at run time */ | 175 /* list of structures to find core_srv_conf quickly at run time */ |
176 | 176 |
177 | 177 |
178 typedef struct { | 178 typedef struct { |
179 /* the default server configuration for this address:port */ | 179 /* the default server configuration for this address:port */ |
180 ngx_http_core_srv_conf_t *core_srv_conf; | 180 ngx_http_core_srv_conf_t *default_server; |
181 | 181 |
182 ngx_http_virtual_names_t *virtual_names; | 182 ngx_http_virtual_names_t *virtual_names; |
183 | 183 |
184 #if (NGX_HTTP_SSL) | 184 #if (NGX_HTTP_SSL) |
185 ngx_uint_t ssl; /* unsigned ssl:1; */ | 185 ngx_uint_t ssl; /* unsigned ssl:1; */ |
228 ngx_uint_t nregex; | 228 ngx_uint_t nregex; |
229 ngx_http_server_name_t *regex; | 229 ngx_http_server_name_t *regex; |
230 #endif | 230 #endif |
231 | 231 |
232 /* the default server configuration for this address:port */ | 232 /* the default server configuration for this address:port */ |
233 ngx_http_core_srv_conf_t *core_srv_conf; | 233 ngx_http_core_srv_conf_t *default_server; |
234 ngx_array_t servers; /* array of ngx_http_core_srv_conf_t */ | 234 ngx_array_t servers; /* array of ngx_http_core_srv_conf_t */ |
235 } ngx_http_conf_addr_t; | 235 } ngx_http_conf_addr_t; |
236 | 236 |
237 | 237 |
238 struct ngx_http_server_name_s { | 238 struct ngx_http_server_name_s { |
239 #if (NGX_PCRE) | 239 #if (NGX_PCRE) |
240 ngx_regex_t *regex; | 240 ngx_regex_t *regex; |
241 #endif | 241 #endif |
242 ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */ | 242 ngx_http_core_srv_conf_t *server; /* virtual name server conf */ |
243 ngx_str_t name; | 243 ngx_str_t name; |
244 }; | 244 }; |
245 | 245 |
246 | 246 |
247 typedef struct { | 247 typedef struct { |