mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-28 10:10:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use pointer to an array instead of array for inclusive locations inside location

Browse Source
This commit is contained in:
Igor Sysoev 2007-06-05 11:42:59 +00:00
parent c915106f20
commit 6633572f31
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http/modules/ngx_http_rewrite_module.c
View File

@ -567,15 +567,14 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
clcf->name = pclcf->name; clcf->name = pclcf->name;
clcf->noname = 1; clcf->noname = 1;
if (pclcf->locations.elts == NULL) { if (pclcf->locations == NULL) {
if (ngx_array_init(&pclcf->locations, cf->pool, 4, sizeof(void *)) pclcf->locations = ngx_array_create(cf->pool, 2, sizeof(void *));
== NGX_ERROR) if (pclcf->locations == NULL) {
{
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
} }
clcfp = ngx_array_push(&pclcf->locations); clcfp = ngx_array_push(pclcf->locations);
if (clcfp == NULL) { if (clcfp == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }

6
src/http/ngx_http.c
View File

@ -1015,7 +1015,11 @@ ngx_http_merge_locations(ngx_conf_t *cf, ngx_array_t *locations,
return rv; 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); clcfp[i]->loc_conf, module, ctx_index);
if (rv != NGX_CONF_OK) { if (rv != NGX_CONF_OK) {
return rv; return rv;

35
src/http/ngx_http_core_module.c
View File

@ -1008,8 +1008,8 @@ ngx_http_core_find_location(ngx_http_request_t *r,
if (found) { if (found) {
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (clcf->locations.nelts) { if (clcf->locations) {
rc = ngx_http_core_find_location(r, &clcf->locations, rc = ngx_http_core_find_location(r, clcf->locations,
clcf->regex_start, len); clcf->regex_start, len);
if (rc != NGX_OK) { if (rc != NGX_OK) {
@ -1793,15 +1793,15 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
if (pclcf->locations.elts == NULL) { if (pclcf->locations == NULL) {
if (ngx_array_init(&pclcf->locations, cf->pool, 4, sizeof(void *)) pclcf->locations = ngx_array_create(cf->pool, 2, sizeof(void *));
!= NGX_OK)
{ if (pclcf->locations == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
} }
clcfp = ngx_array_push(&pclcf->locations); clcfp = ngx_array_push(pclcf->locations);
if (clcfp == NULL) { if (clcfp == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
@ -1821,13 +1821,17 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
return rv; return rv;
} }
ngx_sort(clcf->locations.elts, (size_t) clcf->locations.nelts, if (clcf->locations == NULL) {
return rv;
}
ngx_sort(clcf->locations->elts, (size_t) clcf->locations->nelts,
sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations); sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
clcf->regex_start = clcf->locations.nelts; clcf->regex_start = clcf->locations->nelts;
clcfp = clcf->locations.elts; clcfp = clcf->locations->elts;
for (i = 0; i < clcf->locations.nelts; i++) { for (i = 0; i < clcf->locations->nelts; i++) {
if (clcfp[i]->regex) { if (clcfp[i]->regex) {
clcf->regex_start = i; clcf->regex_start = i;
break; break;
@ -2855,15 +2859,14 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
lcf->name = clcf->name; lcf->name = clcf->name;
lcf->noname = 1; lcf->noname = 1;
if (clcf->locations.elts == NULL) { if (clcf->locations == NULL) {
if (ngx_array_init(&clcf->locations, cf->pool, 4, sizeof(void *)) clcf->locations = ngx_array_create(cf->pool, 2, sizeof(void *));
== NGX_ERROR) if (clcf->locations == NULL) {
{
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
} }
clcfp = ngx_array_push(&clcf->locations); clcfp = ngx_array_push(clcf->locations);
if (clcfp == NULL) { if (clcfp == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }

2
src/http/ngx_http_core_module.h
View File

@ -222,7 +222,7 @@ struct ngx_http_core_loc_conf_s {
unsigned alias:1; unsigned alias:1;
/* array of inclusive ngx_http_core_loc_conf_t */ /* array of inclusive ngx_http_core_loc_conf_t */
ngx_array_t locations; ngx_array_t *locations;
/* pointer to the modules' loc_conf */ /* pointer to the modules' loc_conf */
void **loc_conf ; void **loc_conf ;