diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-14 11:31:50 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-14 11:31:50 +0000 |
| commit | 7d9e3345cde0d3bc9dd84470ed45800e12cca282 (patch) | |
| tree | 081804dfca77a5741a99e305bcc4fd60f7341699 /src/http/ngx_http_core_module.c | |
| parent | ea8828b99ef34db70937f03adf02ab76ddd9dd7a (diff) | |
| download | nginx-7d9e3345cde0d3bc9dd84470ed45800e12cca282.tar.gz nginx-7d9e3345cde0d3bc9dd84470ed45800e12cca282.zip | |
fix client_body_in_file_only type
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 73d7af969..88d836a6b 100644 --- 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 *cf, void *parent, void *child) NGX_HTTP_SATISFY_ALL); ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, NGX_HTTP_IMS_EXACT); - ngx_conf_merge_value(conf->internal, prev->internal, 0); - ngx_conf_merge_value(conf->client_body_in_file_only, + 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->sendfile, prev->sendfile, 0); ngx_conf_merge_size_value(conf->sendfile_max_chunk, prev->sendfile_max_chunk, 0); |