Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3484:81457372d938
chunked_transfer_encoding
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 01 Apr 2010 10:18:00 +0000 |
parents | fd098caab443 |
children | dd1570b6f237 |
comparison
equal
deleted
inserted
replaced
3483:192b727c2563 | 3484:81457372d938 |
---|---|
596 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 596 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
597 ngx_conf_set_enum_slot, | 597 ngx_conf_set_enum_slot, |
598 NGX_HTTP_LOC_CONF_OFFSET, | 598 NGX_HTTP_LOC_CONF_OFFSET, |
599 offsetof(ngx_http_core_loc_conf_t, if_modified_since), | 599 offsetof(ngx_http_core_loc_conf_t, if_modified_since), |
600 &ngx_http_core_if_modified_since }, | 600 &ngx_http_core_if_modified_since }, |
601 | |
602 { ngx_string("chunked_transfer_encoding"), | |
603 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
604 ngx_conf_set_flag_slot, | |
605 NGX_HTTP_LOC_CONF_OFFSET, | |
606 offsetof(ngx_http_core_loc_conf_t, chunked_transfer_encoding), | |
607 NULL }, | |
601 | 608 |
602 { ngx_string("error_page"), | 609 { ngx_string("error_page"), |
603 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF | 610 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |
604 |NGX_CONF_2MORE, | 611 |NGX_CONF_2MORE, |
605 ngx_http_core_error_page, | 612 ngx_http_core_error_page, |
2970 clcf->msie_refresh = NGX_CONF_UNSET; | 2977 clcf->msie_refresh = NGX_CONF_UNSET; |
2971 clcf->log_not_found = NGX_CONF_UNSET; | 2978 clcf->log_not_found = NGX_CONF_UNSET; |
2972 clcf->log_subrequest = NGX_CONF_UNSET; | 2979 clcf->log_subrequest = NGX_CONF_UNSET; |
2973 clcf->recursive_error_pages = NGX_CONF_UNSET; | 2980 clcf->recursive_error_pages = NGX_CONF_UNSET; |
2974 clcf->server_tokens = NGX_CONF_UNSET; | 2981 clcf->server_tokens = NGX_CONF_UNSET; |
2982 clcf->chunked_transfer_encoding = NGX_CONF_UNSET; | |
2975 clcf->types_hash_max_size = NGX_CONF_UNSET_UINT; | 2983 clcf->types_hash_max_size = NGX_CONF_UNSET_UINT; |
2976 clcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; | 2984 clcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; |
2977 | 2985 |
2978 clcf->open_file_cache = NGX_CONF_UNSET_PTR; | 2986 clcf->open_file_cache = NGX_CONF_UNSET_PTR; |
2979 clcf->open_file_cache_valid = NGX_CONF_UNSET; | 2987 clcf->open_file_cache_valid = NGX_CONF_UNSET; |
3213 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); | 3221 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); |
3214 ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0); | 3222 ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0); |
3215 ngx_conf_merge_value(conf->recursive_error_pages, | 3223 ngx_conf_merge_value(conf->recursive_error_pages, |
3216 prev->recursive_error_pages, 0); | 3224 prev->recursive_error_pages, 0); |
3217 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); | 3225 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); |
3226 ngx_conf_merge_value(conf->chunked_transfer_encoding, | |
3227 prev->chunked_transfer_encoding, 1); | |
3218 | 3228 |
3219 ngx_conf_merge_ptr_value(conf->open_file_cache, | 3229 ngx_conf_merge_ptr_value(conf->open_file_cache, |
3220 prev->open_file_cache, NULL); | 3230 prev->open_file_cache, NULL); |
3221 | 3231 |
3222 ngx_conf_merge_sec_value(conf->open_file_cache_valid, | 3232 ngx_conf_merge_sec_value(conf->open_file_cache_valid, |