Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 6314:fcbac620ae83
Style: NGX_PTR_SIZE replaced with sizeof(void *).
The NGX_PTR_SIZE macro is only needed in preprocessor directives where
it's not possible to use sizeof().
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Thu, 03 Dec 2015 20:06:45 +0300 |
| parents | 1d696c646d81 |
| children | cf5e822cf470 |
comparison
equal
deleted
inserted
replaced
| 6313:be3aed17689c | 6314:fcbac620ae83 |
|---|---|
| 3501 ngx_http_server_name_t *sn; | 3501 ngx_http_server_name_t *sn; |
| 3502 | 3502 |
| 3503 /* TODO: it does not merge, it inits only */ | 3503 /* TODO: it does not merge, it inits only */ |
| 3504 | 3504 |
| 3505 ngx_conf_merge_size_value(conf->connection_pool_size, | 3505 ngx_conf_merge_size_value(conf->connection_pool_size, |
| 3506 prev->connection_pool_size, NGX_PTR_SIZE * 64); | 3506 prev->connection_pool_size, 64 * sizeof(void *)); |
| 3507 ngx_conf_merge_size_value(conf->request_pool_size, | 3507 ngx_conf_merge_size_value(conf->request_pool_size, |
| 3508 prev->request_pool_size, 4096); | 3508 prev->request_pool_size, 4096); |
| 3509 ngx_conf_merge_msec_value(conf->client_header_timeout, | 3509 ngx_conf_merge_msec_value(conf->client_header_timeout, |
| 3510 prev->client_header_timeout, 60000); | 3510 prev->client_header_timeout, 60000); |
| 3511 ngx_conf_merge_size_value(conf->client_header_buffer_size, | 3511 ngx_conf_merge_size_value(conf->client_header_buffer_size, |