Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 6140:2911b7e5491b
Removed deprecated HTTP directives.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 29 Apr 2015 13:52:49 +0300 |
parents | 187aa751ad62 |
children | 4f6efabcb09b |
comparison
equal
deleted
inserted
replaced
6139:b19350b896bb | 6140:2911b7e5491b |
---|---|
94 { ngx_http_core_lowat_check }; | 94 { ngx_http_core_lowat_check }; |
95 | 95 |
96 static ngx_conf_post_handler_pt ngx_http_core_pool_size_p = | 96 static ngx_conf_post_handler_pt ngx_http_core_pool_size_p = |
97 ngx_http_core_pool_size; | 97 ngx_http_core_pool_size; |
98 | 98 |
99 static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_server_names = { | |
100 ngx_conf_deprecated, "optimize_server_names", "server_name_in_redirect" | |
101 }; | |
102 | |
103 static ngx_conf_deprecated_t ngx_conf_deprecated_open_file_cache_retest = { | |
104 ngx_conf_deprecated, "open_file_cache_retest", "open_file_cache_valid" | |
105 }; | |
106 | |
107 static ngx_conf_deprecated_t ngx_conf_deprecated_satisfy_any = { | |
108 ngx_conf_deprecated, "satisfy_any", "satisfy" | |
109 }; | |
110 | |
111 | 99 |
112 static ngx_conf_enum_t ngx_http_core_request_body_in_file[] = { | 100 static ngx_conf_enum_t ngx_http_core_request_body_in_file[] = { |
113 { ngx_string("off"), NGX_HTTP_REQUEST_BODY_FILE_OFF }, | 101 { ngx_string("off"), NGX_HTTP_REQUEST_BODY_FILE_OFF }, |
114 { ngx_string("on"), NGX_HTTP_REQUEST_BODY_FILE_ON }, | 102 { ngx_string("on"), NGX_HTTP_REQUEST_BODY_FILE_ON }, |
115 { ngx_string("clean"), NGX_HTTP_REQUEST_BODY_FILE_CLEAN }, | 103 { ngx_string("clean"), NGX_HTTP_REQUEST_BODY_FILE_CLEAN }, |
253 ngx_conf_set_bufs_slot, | 241 ngx_conf_set_bufs_slot, |
254 NGX_HTTP_SRV_CONF_OFFSET, | 242 NGX_HTTP_SRV_CONF_OFFSET, |
255 offsetof(ngx_http_core_srv_conf_t, large_client_header_buffers), | 243 offsetof(ngx_http_core_srv_conf_t, large_client_header_buffers), |
256 NULL }, | 244 NULL }, |
257 | 245 |
258 { ngx_string("optimize_server_names"), | |
259 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, | |
260 ngx_conf_set_flag_slot, | |
261 NGX_HTTP_LOC_CONF_OFFSET, | |
262 offsetof(ngx_http_core_loc_conf_t, server_name_in_redirect), | |
263 &ngx_conf_deprecated_optimize_server_names }, | |
264 | |
265 { ngx_string("ignore_invalid_headers"), | 246 { ngx_string("ignore_invalid_headers"), |
266 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, | 247 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, |
267 ngx_conf_set_flag_slot, | 248 ngx_conf_set_flag_slot, |
268 NGX_HTTP_SRV_CONF_OFFSET, | 249 NGX_HTTP_SRV_CONF_OFFSET, |
269 offsetof(ngx_http_core_srv_conf_t, ignore_invalid_headers), | 250 offsetof(ngx_http_core_srv_conf_t, ignore_invalid_headers), |
517 ngx_conf_set_enum_slot, | 498 ngx_conf_set_enum_slot, |
518 NGX_HTTP_LOC_CONF_OFFSET, | 499 NGX_HTTP_LOC_CONF_OFFSET, |
519 offsetof(ngx_http_core_loc_conf_t, satisfy), | 500 offsetof(ngx_http_core_loc_conf_t, satisfy), |
520 &ngx_http_core_satisfy }, | 501 &ngx_http_core_satisfy }, |
521 | 502 |
522 { ngx_string("satisfy_any"), | |
523 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
524 ngx_conf_set_flag_slot, | |
525 NGX_HTTP_LOC_CONF_OFFSET, | |
526 offsetof(ngx_http_core_loc_conf_t, satisfy), | |
527 &ngx_conf_deprecated_satisfy_any }, | |
528 | |
529 { ngx_string("internal"), | 503 { ngx_string("internal"), |
530 NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS, | 504 NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS, |
531 ngx_http_core_internal, | 505 ngx_http_core_internal, |
532 NGX_HTTP_LOC_CONF_OFFSET, | 506 NGX_HTTP_LOC_CONF_OFFSET, |
533 0, | 507 0, |
686 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 660 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
687 ngx_conf_set_sec_slot, | 661 ngx_conf_set_sec_slot, |
688 NGX_HTTP_LOC_CONF_OFFSET, | 662 NGX_HTTP_LOC_CONF_OFFSET, |
689 offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid), | 663 offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid), |
690 NULL }, | 664 NULL }, |
691 | |
692 { ngx_string("open_file_cache_retest"), | |
693 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
694 ngx_conf_set_sec_slot, | |
695 NGX_HTTP_LOC_CONF_OFFSET, | |
696 offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid), | |
697 &ngx_conf_deprecated_open_file_cache_retest }, | |
698 | 665 |
699 { ngx_string("open_file_cache_min_uses"), | 666 { ngx_string("open_file_cache_min_uses"), |
700 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 667 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
701 ngx_conf_set_num_slot, | 668 ngx_conf_set_num_slot, |
702 NGX_HTTP_LOC_CONF_OFFSET, | 669 NGX_HTTP_LOC_CONF_OFFSET, |