Mercurial > hg > nginx
comparison 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 |
comparison
equal
deleted
inserted
replaced
2840:22c4c012c8c9 | 2841:faafc084a7a4 |
---|---|
3142 | 3142 |
3143 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, | 3143 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, |
3144 NGX_HTTP_SATISFY_ALL); | 3144 NGX_HTTP_SATISFY_ALL); |
3145 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, | 3145 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, |
3146 NGX_HTTP_IMS_EXACT); | 3146 NGX_HTTP_IMS_EXACT); |
3147 ngx_conf_merge_uint_value(conf->client_body_in_file_only, | |
3148 prev->client_body_in_file_only, 0); | |
3147 ngx_conf_merge_value(conf->internal, prev->internal, 0); | 3149 ngx_conf_merge_value(conf->internal, prev->internal, 0); |
3148 ngx_conf_merge_value(conf->client_body_in_file_only, | |
3149 prev->client_body_in_file_only, 0); | |
3150 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 3150 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
3151 ngx_conf_merge_size_value(conf->sendfile_max_chunk, | 3151 ngx_conf_merge_size_value(conf->sendfile_max_chunk, |
3152 prev->sendfile_max_chunk, 0); | 3152 prev->sendfile_max_chunk, 0); |
3153 ngx_conf_merge_off_value(conf->directio, prev->directio, | 3153 ngx_conf_merge_off_value(conf->directio, prev->directio, |
3154 NGX_MAX_OFF_T_VALUE); | 3154 NGX_MAX_OFF_T_VALUE); |