diff options
| author |   robert <robert@openbsd.org> | 2012-11-14 21:35:00 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2012-11-14 21:35:00 +0000 |
| commit | 42bdae40dcaec1c21a23c24121dbdd98a26ba542 (patch) | |
| tree | f419dc7c2442b03afd9dd3e4c0ceaf685aa1849c /usr.sbin/nginx/src/core/ngx_cycle.c | |
| parent | Do not bother reloading r1 from the stack in the epilogue, if it has not been (diff) | |
| download | wireguard-openbsd-42bdae40dcaec1c21a23c24121dbdd98a26ba542.tar.xz wireguard-openbsd-42bdae40dcaec1c21a23c24121dbdd98a26ba542.zip | |
update to 1.2.5
Diffstat (limited to 'usr.sbin/nginx/src/core/ngx_cycle.c')
| -rw-r--r-- | usr.sbin/nginx/src/core/ngx_cycle.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/nginx/src/core/ngx_cycle.c b/usr.sbin/nginx/src/core/ngx_cycle.c index 260a9947f5b..20ee3a346d7 100644 --- a/usr.sbin/nginx/src/core/ngx_cycle.c +++ b/usr.sbin/nginx/src/core/ngx_cycle.c @@ -124,18 +124,18 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) } - n = old_cycle->pathes.nelts ? old_cycle->pathes.nelts : 10; + n = old_cycle->paths.nelts ? old_cycle->paths.nelts : 10; - cycle->pathes.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *)); - if (cycle->pathes.elts == NULL) { + cycle->paths.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *)); + if (cycle->paths.elts == NULL) { ngx_destroy_pool(pool); return NULL; } - cycle->pathes.nelts = 0; - cycle->pathes.size = sizeof(ngx_path_t *); - cycle->pathes.nalloc = n; - cycle->pathes.pool = pool; + cycle->paths.nelts = 0; + cycle->paths.size = sizeof(ngx_path_t *); + cycle->paths.nalloc = n; + cycle->paths.pool = pool; if (old_cycle->open_files.part.nelts) { @@ -340,7 +340,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) } - if (ngx_create_pathes(cycle, ccf->user) != NGX_OK) { + if (ngx_create_paths(cycle, ccf->user) != NGX_OK) { goto failed; } @@ -1044,6 +1044,8 @@ ngx_signal_process(ngx_cycle_t *cycle, char *sig) ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); + ngx_memzero(&file, sizeof(ngx_file_t)); + file.name = ccf->pid; file.log = cycle->log; |