Mercurial > hg > nginx
diff src/http/ngx_http.c @ 1236:5e4d3b5d7ad0
use pointer to an array instead of array for inclusive locations inside location
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 05 Jun 2007 11:42:59 +0000 |
parents | c6c33f81fd79 |
children | 8ef04207c84f bf5b86d5f00e |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1015,7 +1015,11 @@ ngx_http_merge_locations(ngx_conf_t *cf, return rv; } - rv = ngx_http_merge_locations(cf, &clcfp[i]->locations, + if (clcfp[i]->locations == NULL) { + continue; + } + + rv = ngx_http_merge_locations(cf, clcfp[i]->locations, clcfp[i]->loc_conf, module, ctx_index); if (rv != NGX_CONF_OK) { return rv;