Mercurial > hg > nginx-quic
comparison src/http/ngx_http_core_module.c @ 4202:7a739880b80c
Replaced magic constants representing default values of some directives
with appropriate #define's.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 12 Oct 2011 09:33:43 +0000 |
parents | 4f5b3714eead |
children | a949b15df739 |
comparison
equal
deleted
inserted
replaced
4201:1d52dd2b5bb7 | 4202:7a739880b80c |
---|---|
3465 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, | 3465 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, |
3466 NGX_HTTP_SATISFY_ALL); | 3466 NGX_HTTP_SATISFY_ALL); |
3467 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, | 3467 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, |
3468 NGX_HTTP_IMS_EXACT); | 3468 NGX_HTTP_IMS_EXACT); |
3469 ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges, | 3469 ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges, |
3470 0x7fffffff); | 3470 NGX_MAX_INT32_VALUE); |
3471 ngx_conf_merge_uint_value(conf->client_body_in_file_only, | 3471 ngx_conf_merge_uint_value(conf->client_body_in_file_only, |
3472 prev->client_body_in_file_only, 0); | 3472 prev->client_body_in_file_only, |
3473 NGX_HTTP_REQUEST_BODY_FILE_OFF); | |
3473 ngx_conf_merge_value(conf->client_body_in_single_buffer, | 3474 ngx_conf_merge_value(conf->client_body_in_single_buffer, |
3474 prev->client_body_in_single_buffer, 0); | 3475 prev->client_body_in_single_buffer, 0); |
3475 ngx_conf_merge_value(conf->internal, prev->internal, 0); | 3476 ngx_conf_merge_value(conf->internal, prev->internal, 0); |
3476 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 3477 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
3477 ngx_conf_merge_size_value(conf->sendfile_max_chunk, | 3478 ngx_conf_merge_size_value(conf->sendfile_max_chunk, |
3478 prev->sendfile_max_chunk, 0); | 3479 prev->sendfile_max_chunk, 0); |
3479 #if (NGX_HAVE_FILE_AIO) | 3480 #if (NGX_HAVE_FILE_AIO) |
3480 ngx_conf_merge_value(conf->aio, prev->aio, 0); | 3481 ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF); |
3481 #endif | 3482 #endif |
3482 ngx_conf_merge_size_value(conf->read_ahead, prev->read_ahead, 0); | 3483 ngx_conf_merge_size_value(conf->read_ahead, prev->read_ahead, 0); |
3483 ngx_conf_merge_off_value(conf->directio, prev->directio, | 3484 ngx_conf_merge_off_value(conf->directio, prev->directio, |
3484 NGX_MAX_OFF_T_VALUE); | 3485 NGX_OPEN_FILE_DIRECTIO_OFF); |
3485 ngx_conf_merge_off_value(conf->directio_alignment, prev->directio_alignment, | 3486 ngx_conf_merge_off_value(conf->directio_alignment, prev->directio_alignment, |
3486 512); | 3487 512); |
3487 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); | 3488 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); |
3488 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); | 3489 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); |
3489 | 3490 |