Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 303:00c5660d2707
nginx-0.0.3-2004-04-01-20:20:53 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 01 Apr 2004 16:20:53 +0000 |
parents | 502b03d9d2a3 |
children | ce375c313e96 |
comparison
equal
deleted
inserted
replaced
302:1526e7686b20 | 303:00c5660d2707 |
---|---|
147 ngx_conf_set_size_slot, | 147 ngx_conf_set_size_slot, |
148 NGX_HTTP_LOC_CONF_OFFSET, | 148 NGX_HTTP_LOC_CONF_OFFSET, |
149 offsetof(ngx_http_core_loc_conf_t, client_max_body_size), | 149 offsetof(ngx_http_core_loc_conf_t, client_max_body_size), |
150 NULL }, | 150 NULL }, |
151 | 151 |
152 { ngx_string("client_body_buffer_size"), | |
153 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
154 ngx_conf_set_size_slot, | |
155 NGX_HTTP_LOC_CONF_OFFSET, | |
156 offsetof(ngx_http_core_loc_conf_t, client_body_buffer_size), | |
157 NULL }, | |
158 | |
152 { ngx_string("client_body_timeout"), | 159 { ngx_string("client_body_timeout"), |
153 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 160 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
154 ngx_conf_set_msec_slot, | 161 ngx_conf_set_msec_slot, |
155 NGX_HTTP_LOC_CONF_OFFSET, | 162 NGX_HTTP_LOC_CONF_OFFSET, |
156 offsetof(ngx_http_core_loc_conf_t, client_body_timeout), | 163 offsetof(ngx_http_core_loc_conf_t, client_body_timeout), |
1179 lcf->alias = 0; | 1186 lcf->alias = 0; |
1180 | 1187 |
1181 */ | 1188 */ |
1182 | 1189 |
1183 lcf->client_max_body_size = NGX_CONF_UNSET_SIZE; | 1190 lcf->client_max_body_size = NGX_CONF_UNSET_SIZE; |
1191 lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE; | |
1184 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; | 1192 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; |
1185 lcf->sendfile = NGX_CONF_UNSET; | 1193 lcf->sendfile = NGX_CONF_UNSET; |
1186 lcf->tcp_nopush = NGX_CONF_UNSET; | 1194 lcf->tcp_nopush = NGX_CONF_UNSET; |
1187 lcf->send_timeout = NGX_CONF_UNSET_MSEC; | 1195 lcf->send_timeout = NGX_CONF_UNSET_MSEC; |
1188 lcf->send_lowat = NGX_CONF_UNSET_SIZE; | 1196 lcf->send_lowat = NGX_CONF_UNSET_SIZE; |
1259 ngx_conf_merge_str_value(conf->default_type, | 1267 ngx_conf_merge_str_value(conf->default_type, |
1260 prev->default_type, "text/plain"); | 1268 prev->default_type, "text/plain"); |
1261 | 1269 |
1262 ngx_conf_merge_size_value(conf->client_max_body_size, | 1270 ngx_conf_merge_size_value(conf->client_max_body_size, |
1263 prev->client_max_body_size, 10 * 1024 * 1024); | 1271 prev->client_max_body_size, 10 * 1024 * 1024); |
1272 ngx_conf_merge_size_value(conf->client_body_buffer_size, | |
1273 prev->client_body_buffer_size, 8192); | |
1264 ngx_conf_merge_msec_value(conf->client_body_timeout, | 1274 ngx_conf_merge_msec_value(conf->client_body_timeout, |
1265 prev->client_body_timeout, 60000); | 1275 prev->client_body_timeout, 60000); |
1266 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 1276 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
1267 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); | 1277 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); |
1268 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); | 1278 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); |