Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.h @ 1804:d457a1576532
several changes in server_name:
*) server_name_in_redirect directive and removal of the '*' stub
*) use server address in redirect if host can not be detected
*) ngx_http_server_addr()
*) allow wildcard and regex names to be a main server_name
*) DAV Destination header is tested against Host header
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 29 Dec 2007 15:30:39 +0000 |
parents | 775edc46ee66 |
children | ba9e6e57f65d |
comparison
equal
deleted
inserted
replaced
1803:7405719e4848 | 1804:d457a1576532 |
---|---|
129 */ | 129 */ |
130 ngx_array_t locations; | 130 ngx_array_t locations; |
131 | 131 |
132 unsigned regex_start:15; | 132 unsigned regex_start:15; |
133 unsigned named_start:15; | 133 unsigned named_start:15; |
134 unsigned wildcard:1; | |
135 | 134 |
136 /* array of the ngx_http_listen_t, "listen" directive */ | 135 /* array of the ngx_http_listen_t, "listen" directive */ |
137 ngx_array_t listen; | 136 ngx_array_t listen; |
138 | 137 |
139 /* array of the ngx_http_server_name_t, "server_name" directive */ | 138 /* array of the ngx_http_server_name_t, "server_name" directive */ |
292 ngx_flag_t client_body_in_file_only; /* client_body_in_file_only */ | 291 ngx_flag_t client_body_in_file_only; /* client_body_in_file_only */ |
293 ngx_flag_t sendfile; /* sendfile */ | 292 ngx_flag_t sendfile; /* sendfile */ |
294 ngx_flag_t tcp_nopush; /* tcp_nopush */ | 293 ngx_flag_t tcp_nopush; /* tcp_nopush */ |
295 ngx_flag_t tcp_nodelay; /* tcp_nodelay */ | 294 ngx_flag_t tcp_nodelay; /* tcp_nodelay */ |
296 ngx_flag_t reset_timedout_connection; /* reset_timedout_connection */ | 295 ngx_flag_t reset_timedout_connection; /* reset_timedout_connection */ |
296 ngx_flag_t server_name_in_redirect; /* server_name_in_redirect */ | |
297 ngx_flag_t port_in_redirect; /* port_in_redirect */ | 297 ngx_flag_t port_in_redirect; /* port_in_redirect */ |
298 ngx_flag_t msie_padding; /* msie_padding */ | 298 ngx_flag_t msie_padding; /* msie_padding */ |
299 ngx_flag_t msie_refresh; /* msie_refresh */ | 299 ngx_flag_t msie_refresh; /* msie_refresh */ |
300 ngx_flag_t log_not_found; /* log_not_found */ | 300 ngx_flag_t log_not_found; /* log_not_found */ |
301 ngx_flag_t recursive_error_pages; /* recursive_error_pages */ | 301 ngx_flag_t recursive_error_pages; /* recursive_error_pages */ |
350 ngx_int_t ngx_http_set_content_type(ngx_http_request_t *r); | 350 ngx_int_t ngx_http_set_content_type(ngx_http_request_t *r); |
351 ngx_int_t ngx_http_set_exten(ngx_http_request_t *r); | 351 ngx_int_t ngx_http_set_exten(ngx_http_request_t *r); |
352 u_char *ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *name, | 352 u_char *ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *name, |
353 size_t *root_length, size_t reserved); | 353 size_t *root_length, size_t reserved); |
354 ngx_int_t ngx_http_auth_basic_user(ngx_http_request_t *r); | 354 ngx_int_t ngx_http_auth_basic_user(ngx_http_request_t *r); |
355 ngx_int_t ngx_http_server_addr(ngx_http_request_t *r, ngx_str_t *s); | |
355 #if (NGX_HTTP_GZIP) | 356 #if (NGX_HTTP_GZIP) |
356 ngx_int_t ngx_http_gzip_ok(ngx_http_request_t *r); | 357 ngx_int_t ngx_http_gzip_ok(ngx_http_request_t *r); |
357 #endif | 358 #endif |
358 | 359 |
359 | 360 |