Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 158:2d15b82126ed NGINX_0_3_26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.26 *) Change: the "optimize_host_names" directive was renamed to the "optimize_server_names". *) Bugfix: if in the "proxy_pass" directive was no the URI part, then the main request URI was transferred to a backend while proxying the SSI subrequest.
author Igor Sysoev <http://sysoev.ru>
date Fri, 03 Feb 2006 00:00:00 +0300
parents bb61aa162c6b
children 73e8476f9142
comparison
equal deleted inserted replaced
157:10bd259db2a7 158:2d15b82126ed
60 static char *ngx_http_core_lowat_check(ngx_conf_t *cf, void *post, void *data); 60 static char *ngx_http_core_lowat_check(ngx_conf_t *cf, void *post, void *data);
61 61
62 static ngx_conf_post_t ngx_http_core_lowat_post = 62 static ngx_conf_post_t ngx_http_core_lowat_post =
63 { ngx_http_core_lowat_check }; 63 { ngx_http_core_lowat_check };
64 64
65 static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = {
66 ngx_conf_deprecated, "optimize_host_names", "optimize_server_names"
67 };
68
65 69
66 static ngx_conf_enum_t ngx_http_restrict_host_names[] = { 70 static ngx_conf_enum_t ngx_http_restrict_host_names[] = {
67 { ngx_string("off"), NGX_HTTP_RESTRICT_HOST_OFF }, 71 { ngx_string("off"), NGX_HTTP_RESTRICT_HOST_OFF },
68 { ngx_string("on"), NGX_HTTP_RESTRICT_HOST_ON }, 72 { ngx_string("on"), NGX_HTTP_RESTRICT_HOST_ON },
69 { ngx_string("close"), NGX_HTTP_RESTRICT_HOST_CLOSE }, 73 { ngx_string("close"), NGX_HTTP_RESTRICT_HOST_CLOSE },
134 ngx_conf_set_enum_slot, 138 ngx_conf_set_enum_slot,
135 NGX_HTTP_SRV_CONF_OFFSET, 139 NGX_HTTP_SRV_CONF_OFFSET,
136 offsetof(ngx_http_core_srv_conf_t, restrict_host_names), 140 offsetof(ngx_http_core_srv_conf_t, restrict_host_names),
137 &ngx_http_restrict_host_names }, 141 &ngx_http_restrict_host_names },
138 142
143 { ngx_string("optimize_server_names"),
144 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
145 ngx_conf_set_flag_slot,
146 NGX_HTTP_SRV_CONF_OFFSET,
147 offsetof(ngx_http_core_srv_conf_t, optimize_server_names),
148 NULL },
149
139 { ngx_string("optimize_host_names"), 150 { ngx_string("optimize_host_names"),
140 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, 151 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
141 ngx_conf_set_flag_slot, 152 ngx_conf_set_flag_slot,
142 NGX_HTTP_SRV_CONF_OFFSET, 153 NGX_HTTP_SRV_CONF_OFFSET,
143 offsetof(ngx_http_core_srv_conf_t, optimize_host_names), 154 offsetof(ngx_http_core_srv_conf_t, optimize_server_names),
144 NULL }, 155 &ngx_conf_deprecated_optimize_host_names },
145 156
146 { ngx_string("ignore_invalid_headers"), 157 { ngx_string("ignore_invalid_headers"),
147 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, 158 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
148 ngx_conf_set_flag_slot, 159 ngx_conf_set_flag_slot,
149 NGX_HTTP_SRV_CONF_OFFSET, 160 NGX_HTTP_SRV_CONF_OFFSET,
1838 cscf->connection_pool_size = NGX_CONF_UNSET_SIZE; 1849 cscf->connection_pool_size = NGX_CONF_UNSET_SIZE;
1839 cscf->request_pool_size = NGX_CONF_UNSET_SIZE; 1850 cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
1840 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC; 1851 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
1841 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE; 1852 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
1842 cscf->restrict_host_names = NGX_CONF_UNSET_UINT; 1853 cscf->restrict_host_names = NGX_CONF_UNSET_UINT;
1843 cscf->optimize_host_names = NGX_CONF_UNSET; 1854 cscf->optimize_server_names = NGX_CONF_UNSET;
1844 cscf->ignore_invalid_headers = NGX_CONF_UNSET; 1855 cscf->ignore_invalid_headers = NGX_CONF_UNSET;
1845 1856
1846 return cscf; 1857 return cscf;
1847 } 1858 }
1848 1859
1926 } 1937 }
1927 1938
1928 ngx_conf_merge_unsigned_value(conf->restrict_host_names, 1939 ngx_conf_merge_unsigned_value(conf->restrict_host_names,
1929 prev->restrict_host_names, 0); 1940 prev->restrict_host_names, 0);
1930 1941
1931 ngx_conf_merge_value(conf->optimize_host_names, 1942 ngx_conf_merge_value(conf->optimize_server_names,
1932 prev->optimize_host_names, 1); 1943 prev->optimize_server_names, 1);
1933 1944
1934 ngx_conf_merge_value(conf->ignore_invalid_headers, 1945 ngx_conf_merge_value(conf->ignore_invalid_headers,
1935 prev->ignore_invalid_headers, 1); 1946 prev->ignore_invalid_headers, 1);
1936 1947
1937 return NGX_CONF_OK; 1948 return NGX_CONF_OK;