Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 3578:28ee756697b1 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3412, r3485: *) allow a chunked body for 201 responses *) chunked_transfer_encoding
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jun 2010 09:19:10 +0000
parents 5d9ff79eab6f
children 8152369f7037
comparison
equal deleted inserted replaced
3577:376a648e4541 3578:28ee756697b1
557 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 557 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
558 ngx_conf_set_enum_slot, 558 ngx_conf_set_enum_slot,
559 NGX_HTTP_LOC_CONF_OFFSET, 559 NGX_HTTP_LOC_CONF_OFFSET,
560 offsetof(ngx_http_core_loc_conf_t, if_modified_since), 560 offsetof(ngx_http_core_loc_conf_t, if_modified_since),
561 &ngx_http_core_if_modified_since }, 561 &ngx_http_core_if_modified_since },
562
563 { ngx_string("chunked_transfer_encoding"),
564 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
565 ngx_conf_set_flag_slot,
566 NGX_HTTP_LOC_CONF_OFFSET,
567 offsetof(ngx_http_core_loc_conf_t, chunked_transfer_encoding),
568 NULL },
562 569
563 { ngx_string("error_page"), 570 { ngx_string("error_page"),
564 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF 571 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
565 |NGX_CONF_2MORE, 572 |NGX_CONF_2MORE,
566 ngx_http_core_error_page, 573 ngx_http_core_error_page,
2952 lcf->msie_refresh = NGX_CONF_UNSET; 2959 lcf->msie_refresh = NGX_CONF_UNSET;
2953 lcf->log_not_found = NGX_CONF_UNSET; 2960 lcf->log_not_found = NGX_CONF_UNSET;
2954 lcf->log_subrequest = NGX_CONF_UNSET; 2961 lcf->log_subrequest = NGX_CONF_UNSET;
2955 lcf->recursive_error_pages = NGX_CONF_UNSET; 2962 lcf->recursive_error_pages = NGX_CONF_UNSET;
2956 lcf->server_tokens = NGX_CONF_UNSET; 2963 lcf->server_tokens = NGX_CONF_UNSET;
2964 lcf->chunked_transfer_encoding = NGX_CONF_UNSET;
2957 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; 2965 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
2958 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; 2966 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
2959 2967
2960 lcf->open_file_cache = NGX_CONF_UNSET_PTR; 2968 lcf->open_file_cache = NGX_CONF_UNSET_PTR;
2961 lcf->open_file_cache_valid = NGX_CONF_UNSET; 2969 lcf->open_file_cache_valid = NGX_CONF_UNSET;
3189 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); 3197 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1);
3190 ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0); 3198 ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0);
3191 ngx_conf_merge_value(conf->recursive_error_pages, 3199 ngx_conf_merge_value(conf->recursive_error_pages,
3192 prev->recursive_error_pages, 0); 3200 prev->recursive_error_pages, 0);
3193 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); 3201 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1);
3202 ngx_conf_merge_value(conf->chunked_transfer_encoding,
3203 prev->chunked_transfer_encoding, 1);
3194 3204
3195 ngx_conf_merge_ptr_value(conf->open_file_cache, 3205 ngx_conf_merge_ptr_value(conf->open_file_cache,
3196 prev->open_file_cache, NULL); 3206 prev->open_file_cache, NULL);
3197 3207
3198 ngx_conf_merge_sec_value(conf->open_file_cache_valid, 3208 ngx_conf_merge_sec_value(conf->open_file_cache_valid,