Mercurial > hg > nginx
diff src/http/ngx_http_core_module.c @ 2841:faafc084a7a4
fix client_body_in_file_only type
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 14 May 2009 11:31:50 +0000 |
parents | 5eb4e2d2e9fa |
children | 84048fc9225f |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3144,9 +3144,9 @@ ngx_http_core_merge_loc_conf(ngx_conf_t NGX_HTTP_SATISFY_ALL); ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, NGX_HTTP_IMS_EXACT); + ngx_conf_merge_uint_value(conf->client_body_in_file_only, + prev->client_body_in_file_only, 0); ngx_conf_merge_value(conf->internal, prev->internal, 0); - ngx_conf_merge_value(conf->client_body_in_file_only, - prev->client_body_in_file_only, 0); ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); ngx_conf_merge_size_value(conf->sendfile_max_chunk, prev->sendfile_max_chunk, 0);