Mercurial > hg > nginx
changeset 1080:681e048981a6
fix online upgrade
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 25 Jan 2007 21:48:28 +0000 |
parents | c1d1a14ed071 |
children | 4cf9d9b644f7 |
files | src/core/nginx.c |
diffstat | 1 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/nginx.c Thu Jan 25 21:45:22 2007 +0000 +++ b/src/core/nginx.c Thu Jan 25 21:48:28 2007 +0000 @@ -423,15 +423,8 @@ ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); - if (last) { - n = *last; - - } else { - if (ccf->environment) { - return ccf->environment; - } - - n = 0; + if (last == NULL && ccf->environment) { + return ccf->environment; } var = ccf->env.elts; @@ -453,6 +446,8 @@ tz_found: + n = 0; + for (i = 0; i < ccf->env.nelts; i++) { if (var[i].data[var[i].len] == '=') { @@ -472,8 +467,8 @@ } if (last) { + env = ngx_alloc((*last + n + 1) * sizeof(char *), cycle->log); *last = n; - env = ngx_alloc((n + 1) * sizeof(char *), cycle->log); } else { env = ngx_palloc(cycle->pool, (n + 1) * sizeof(char *));