Mercurial > hg > nginx-vendor-1-0
comparison src/core/ngx_cycle.c @ 296:2ceaee987f37 NGINX_0_5_18
nginx 0.5.18
*) Feature: the ngx_http_sub_filter_module.
*) Feature: the "$upstream_http_..." variables.
*) Feature: now the $upstream_status and $upstream_response_time
variables keep data about all upstreams before X-Accel-Redirect.
*) Bugfix: a segmentation fault occurred in master process after first
reconfiguration and receiving any signal if nginx was built with
ngx_http_perl_module and perl did not support multiplicity; bug
appeared in 0.5.9.
*) Bugfix: if perl did not support multiplicity, then after
reconfiguration perl code did not work; bug appeared in 0.3.38.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 19 Apr 2007 00:00:00 +0400 |
parents | 3dbecd747fbb |
children | b743d290eb3b |
comparison
equal
deleted
inserted
replaced
295:65b7ac8795e3 | 296:2ceaee987f37 |
---|---|
52 ngx_shm_zone_t *shm_zone, *oshm_zone; | 52 ngx_shm_zone_t *shm_zone, *oshm_zone; |
53 ngx_slab_pool_t *shpool; | 53 ngx_slab_pool_t *shpool; |
54 ngx_list_part_t *part, *opart; | 54 ngx_list_part_t *part, *opart; |
55 ngx_open_file_t *file; | 55 ngx_open_file_t *file; |
56 ngx_listening_t *ls, *nls; | 56 ngx_listening_t *ls, *nls; |
57 ngx_core_conf_t *ccf; | 57 ngx_core_conf_t *ccf, *old_ccf; |
58 ngx_core_module_t *module; | 58 ngx_core_module_t *module; |
59 #if !(WIN32) | |
60 ngx_core_conf_t *old_ccf; | |
61 #endif | |
62 | 59 |
63 log = old_cycle->log; | 60 log = old_cycle->log; |
64 | 61 |
65 pool = ngx_create_pool(NGX_CYCLE_POOL_SIZE, log); | 62 pool = ngx_create_pool(NGX_CYCLE_POOL_SIZE, log); |
66 if (pool == NULL) { | 63 if (pool == NULL) { |
744 | 741 |
745 return cycle; | 742 return cycle; |
746 | 743 |
747 | 744 |
748 failed: | 745 failed: |
746 | |
747 if (!ngx_is_init_cycle(old_cycle)) { | |
748 old_ccf = (ngx_core_conf_t *) ngx_get_conf(old_cycle->conf_ctx, | |
749 ngx_core_module); | |
750 if (old_ccf->environment) { | |
751 environ = old_ccf->environment; | |
752 } | |
753 } | |
749 | 754 |
750 /* rollback the new cycle configuration */ | 755 /* rollback the new cycle configuration */ |
751 | 756 |
752 part = &cycle->open_files.part; | 757 part = &cycle->open_files.part; |
753 file = part->elts; | 758 file = part->elts; |