Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 2845:10d6b9950453
client_body_in_single_buffer
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 14 May 2009 11:41:33 +0000 |
parents | eb461016d980 |
children | 507fc5ac9839 |
comparison
equal
deleted
inserted
replaced
2844:2f3c80ff2123 | 2845:10d6b9950453 |
---|---|
359 ngx_conf_set_enum_slot, | 359 ngx_conf_set_enum_slot, |
360 NGX_HTTP_LOC_CONF_OFFSET, | 360 NGX_HTTP_LOC_CONF_OFFSET, |
361 offsetof(ngx_http_core_loc_conf_t, client_body_in_file_only), | 361 offsetof(ngx_http_core_loc_conf_t, client_body_in_file_only), |
362 &ngx_http_core_request_body_in_file }, | 362 &ngx_http_core_request_body_in_file }, |
363 | 363 |
364 { ngx_string("client_body_in_single_buffer"), | |
365 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
366 ngx_conf_set_flag_slot, | |
367 NGX_HTTP_LOC_CONF_OFFSET, | |
368 offsetof(ngx_http_core_loc_conf_t, client_body_in_single_buffer), | |
369 NULL }, | |
370 | |
364 { ngx_string("sendfile"), | 371 { ngx_string("sendfile"), |
365 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF | 372 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |
366 |NGX_CONF_TAKE1, | 373 |NGX_CONF_TAKE1, |
367 ngx_conf_set_flag_slot, | 374 ngx_conf_set_flag_slot, |
368 NGX_HTTP_LOC_CONF_OFFSET, | 375 NGX_HTTP_LOC_CONF_OFFSET, |
1314 r->request_body_file_log_level = NGX_LOG_NOTICE; | 1321 r->request_body_file_log_level = NGX_LOG_NOTICE; |
1315 | 1322 |
1316 } else { | 1323 } else { |
1317 r->request_body_file_log_level = NGX_LOG_WARN; | 1324 r->request_body_file_log_level = NGX_LOG_WARN; |
1318 } | 1325 } |
1326 | |
1327 r->request_body_in_single_buf = clcf->client_body_in_single_buffer; | |
1319 | 1328 |
1320 if (r->keepalive && clcf->keepalive_timeout == 0) { | 1329 if (r->keepalive && clcf->keepalive_timeout == 0) { |
1321 r->keepalive = 0; | 1330 r->keepalive = 0; |
1322 } | 1331 } |
1323 | 1332 |
2952 lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE; | 2961 lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE; |
2953 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; | 2962 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; |
2954 lcf->satisfy = NGX_CONF_UNSET_UINT; | 2963 lcf->satisfy = NGX_CONF_UNSET_UINT; |
2955 lcf->if_modified_since = NGX_CONF_UNSET_UINT; | 2964 lcf->if_modified_since = NGX_CONF_UNSET_UINT; |
2956 lcf->client_body_in_file_only = NGX_CONF_UNSET_UINT; | 2965 lcf->client_body_in_file_only = NGX_CONF_UNSET_UINT; |
2966 lcf->client_body_in_single_buffer = NGX_CONF_UNSET; | |
2957 lcf->internal = NGX_CONF_UNSET; | 2967 lcf->internal = NGX_CONF_UNSET; |
2958 lcf->sendfile = NGX_CONF_UNSET; | 2968 lcf->sendfile = NGX_CONF_UNSET; |
2959 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE; | 2969 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE; |
2960 lcf->directio = NGX_CONF_UNSET; | 2970 lcf->directio = NGX_CONF_UNSET; |
2961 lcf->tcp_nopush = NGX_CONF_UNSET; | 2971 lcf->tcp_nopush = NGX_CONF_UNSET; |
3144 NGX_HTTP_SATISFY_ALL); | 3154 NGX_HTTP_SATISFY_ALL); |
3145 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, | 3155 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, |
3146 NGX_HTTP_IMS_EXACT); | 3156 NGX_HTTP_IMS_EXACT); |
3147 ngx_conf_merge_uint_value(conf->client_body_in_file_only, | 3157 ngx_conf_merge_uint_value(conf->client_body_in_file_only, |
3148 prev->client_body_in_file_only, 0); | 3158 prev->client_body_in_file_only, 0); |
3159 ngx_conf_merge_value(conf->client_body_in_single_buffer, | |
3160 prev->client_body_in_single_buffer, 0); | |
3149 ngx_conf_merge_value(conf->internal, prev->internal, 0); | 3161 ngx_conf_merge_value(conf->internal, prev->internal, 0); |
3150 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 3162 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
3151 ngx_conf_merge_size_value(conf->sendfile_max_chunk, | 3163 ngx_conf_merge_size_value(conf->sendfile_max_chunk, |
3152 prev->sendfile_max_chunk, 0); | 3164 prev->sendfile_max_chunk, 0); |
3153 ngx_conf_merge_off_value(conf->directio, prev->directio, | 3165 ngx_conf_merge_off_value(conf->directio, prev->directio, |