Mercurial > hg > nginx
diff src/http/ngx_http_core_module.c @ 293:ec3c049681fd
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 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -142,6 +142,13 @@ static ngx_command_t ngx_http_core_comm 0, NULL }, + { ngx_string("client_max_body_size"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_core_loc_conf_t, client_max_body_size), + NULL }, + { ngx_string("client_body_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -1147,6 +1154,7 @@ static void *ngx_http_core_create_loc_co */ + lcf->client_max_body_size = NGX_CONF_UNSET_SIZE; lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; lcf->sendfile = NGX_CONF_UNSET; lcf->tcp_nopush = NGX_CONF_UNSET; @@ -1225,6 +1233,8 @@ static char *ngx_http_core_merge_loc_con ngx_conf_merge_str_value(conf->default_type, prev->default_type, "text/plain"); + ngx_conf_merge_size_value(conf->client_max_body_size, + prev->client_max_body_size, 10 * 1024 * 1024); ngx_conf_merge_msec_value(conf->client_body_timeout, prev->client_body_timeout, 60000); ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);