Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 293:ec3c049681fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.3-2004-03-19-08:25:53 import
author Igor Sysoev <igor@sysoev.ru>
date Fri, 19 Mar 2004 05:25:53 +0000
parents 87e73f067470
children 5cfd65b8b0a7
comparison
equal deleted inserted replaced
292:a472bfb778b3 293:ec3c049681fd
140 ngx_set_root, 140 ngx_set_root,
141 NGX_HTTP_LOC_CONF_OFFSET, 141 NGX_HTTP_LOC_CONF_OFFSET,
142 0, 142 0,
143 NULL }, 143 NULL },
144 144
145 { ngx_string("client_max_body_size"),
146 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
147 ngx_conf_set_size_slot,
148 NGX_HTTP_LOC_CONF_OFFSET,
149 offsetof(ngx_http_core_loc_conf_t, client_max_body_size),
150 NULL },
151
145 { ngx_string("client_body_timeout"), 152 { ngx_string("client_body_timeout"),
146 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 153 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
147 ngx_conf_set_msec_slot, 154 ngx_conf_set_msec_slot,
148 NGX_HTTP_LOC_CONF_OFFSET, 155 NGX_HTTP_LOC_CONF_OFFSET,
149 offsetof(ngx_http_core_loc_conf_t, client_body_timeout), 156 offsetof(ngx_http_core_loc_conf_t, client_body_timeout),
1145 lcf->auto_redirect = 0; 1152 lcf->auto_redirect = 0;
1146 lcf->alias = 0; 1153 lcf->alias = 0;
1147 1154
1148 */ 1155 */
1149 1156
1157 lcf->client_max_body_size = NGX_CONF_UNSET_SIZE;
1150 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; 1158 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
1151 lcf->sendfile = NGX_CONF_UNSET; 1159 lcf->sendfile = NGX_CONF_UNSET;
1152 lcf->tcp_nopush = NGX_CONF_UNSET; 1160 lcf->tcp_nopush = NGX_CONF_UNSET;
1153 lcf->send_timeout = NGX_CONF_UNSET_MSEC; 1161 lcf->send_timeout = NGX_CONF_UNSET_MSEC;
1154 lcf->send_lowat = NGX_CONF_UNSET_SIZE; 1162 lcf->send_lowat = NGX_CONF_UNSET_SIZE;
1223 } 1231 }
1224 1232
1225 ngx_conf_merge_str_value(conf->default_type, 1233 ngx_conf_merge_str_value(conf->default_type,
1226 prev->default_type, "text/plain"); 1234 prev->default_type, "text/plain");
1227 1235
1236 ngx_conf_merge_size_value(conf->client_max_body_size,
1237 prev->client_max_body_size, 10 * 1024 * 1024);
1228 ngx_conf_merge_msec_value(conf->client_body_timeout, 1238 ngx_conf_merge_msec_value(conf->client_body_timeout,
1229 prev->client_body_timeout, 60000); 1239 prev->client_body_timeout, 60000);
1230 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); 1240 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
1231 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); 1241 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0);
1232 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); 1242 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000);