Mercurial > hg > nginx-quic
comparison 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 |
comparison
equal
deleted
inserted
replaced
1235:f8a40ccafb04 | 1236:5e4d3b5d7ad0 |
---|---|
1013 clcfp[i]->loc_conf[ctx_index]); | 1013 clcfp[i]->loc_conf[ctx_index]); |
1014 if (rv != NGX_CONF_OK) { | 1014 if (rv != NGX_CONF_OK) { |
1015 return rv; | 1015 return rv; |
1016 } | 1016 } |
1017 | 1017 |
1018 rv = ngx_http_merge_locations(cf, &clcfp[i]->locations, | 1018 if (clcfp[i]->locations == NULL) { |
1019 continue; | |
1020 } | |
1021 | |
1022 rv = ngx_http_merge_locations(cf, clcfp[i]->locations, | |
1019 clcfp[i]->loc_conf, module, ctx_index); | 1023 clcfp[i]->loc_conf, module, ctx_index); |
1020 if (rv != NGX_CONF_OK) { | 1024 if (rv != NGX_CONF_OK) { |
1021 return rv; | 1025 return rv; |
1022 } | 1026 } |
1023 } | 1027 } |