diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-06-05 11:42:59 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-06-05 11:42:59 +0000 |
| commit | 6633572f3118a4c4814699e32ea0671b8b64109c (patch) | |
| tree | 20990ab3ba5c3007f0ff0c8bebb22ea93669300a /src/http/ngx_http.c | |
| parent | c915106f20629a3306fae10db413d5d596c1fc3e (diff) | |
| download | nginx-6633572f3118a4c4814699e32ea0671b8b64109c.tar.gz nginx-6633572f3118a4c4814699e32ea0671b8b64109c.zip | |
use pointer to an array instead of array for inclusive locations inside location
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 46e576a90..c6bc6c581 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1015,7 +1015,11 @@ ngx_http_merge_locations(ngx_conf_t *cf, ngx_array_t *locations, 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; |