Mercurial > hg > nginx-ranges
diff src/http/modules/ngx_http_index_module.c @ 230:38e7b94d63ac NGINX_0_4_0
nginx 0.4.0
*) Change in internal API: the HTTP modules initialization was moved
from the init module phase to the HTTP postconfiguration phase.
*) Change: now the request body is not read beforehand for the
ngx_http_perl_module: it's required to start the reading using the
$r->has_request_body method.
*) Feature: the ngx_http_perl_module supports the DECLINED return code.
*) Feature: the ngx_http_dav_module supports the incoming "Date" header
line for the PUT method.
*) Feature: the "ssi" directive is available inside the "if" block.
*) Bugfix: a segmentation fault occurred if there was an "index"
directive with variables and the first index name was without
variables; bug appeared in 0.1.29.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 30 Aug 2006 00:00:00 +0400 |
parents | fa32d59d9a15 |
children | d8f5c91a5c07 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_index_module.c +++ b/src/http/modules/ngx_http_index_module.c @@ -40,7 +40,7 @@ static ngx_int_t ngx_http_index_test_dir static ngx_int_t ngx_http_index_error(ngx_http_request_t *r, ngx_http_index_ctx_t *ctx, ngx_err_t err); -static ngx_int_t ngx_http_index_init(ngx_cycle_t *cycle); +static ngx_int_t ngx_http_index_init(ngx_conf_t *cf); static void *ngx_http_index_create_loc_conf(ngx_conf_t *cf); static char *ngx_http_index_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child); @@ -74,7 +74,7 @@ static ngx_command_t ngx_http_index_com static ngx_http_module_t ngx_http_index_module_ctx = { NULL, /* preconfiguration */ - NULL, /* postconfiguration */ + ngx_http_index_init, /* postconfiguration */ NULL, /* create main configuration */ NULL, /* init main configuration */ @@ -93,7 +93,7 @@ ngx_module_t ngx_http_index_module = { ngx_http_index_commands, /* module directives */ NGX_HTTP_MODULE, /* module type */ NULL, /* init master */ - ngx_http_index_init, /* init module */ + NULL, /* init module */ NULL, /* init process */ NULL, /* init thread */ NULL, /* exit thread */ @@ -198,7 +198,7 @@ ngx_http_index_handler(ngx_http_request_ len += 16; } - if (len > ctx->path.len) { + if (len > (size_t) (ctx->path.data + ctx->path.len - ctx->index.data)) { last = ngx_http_map_uri_to_path(r, &ctx->path, len); if (last == NULL) { @@ -378,7 +378,7 @@ ngx_http_index_create_loc_conf(ngx_conf_ } conf->indices = NULL; - conf->max_index_len = 1; + conf->max_index_len = 0; return conf; } @@ -422,6 +422,25 @@ ngx_http_index_merge_loc_conf(ngx_conf_t } +static ngx_int_t +ngx_http_index_init(ngx_conf_t *cf) +{ + ngx_http_handler_pt *h; + ngx_http_core_main_conf_t *cmcf; + + cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); + + h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers); + if (h == NULL) { + return NGX_ERROR; + } + + *h = ngx_http_index_handler; + + return NGX_OK; +} + + /* TODO: warn about duplicate indices */ static char * @@ -429,8 +448,8 @@ ngx_http_index_set_index(ngx_conf_t *cf, { ngx_http_index_loc_conf_t *ilcf = conf; + ngx_str_t *value; ngx_uint_t i, n; - ngx_str_t *value; ngx_http_index_t *index; ngx_http_script_compile_t sc; @@ -471,9 +490,7 @@ ngx_http_index_set_index(ngx_conf_t *cf, n = ngx_http_script_variables_count(&value[i]); if (n == 0) { - if (ilcf->max_index_len != 0 - && ilcf->max_index_len < index->name.len) - { + if (ilcf->max_index_len < index->name.len) { ilcf->max_index_len = index->name.len; } @@ -496,28 +513,7 @@ ngx_http_index_set_index(ngx_conf_t *cf, if (ngx_http_script_compile(&sc) != NGX_OK) { return NGX_CONF_ERROR; } - - ilcf->max_index_len = 0; } return NGX_CONF_OK; } - - -static ngx_int_t -ngx_http_index_init(ngx_cycle_t *cycle) -{ - ngx_http_handler_pt *h; - ngx_http_core_main_conf_t *cmcf; - - cmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_core_module); - - h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers); - if (h == NULL) { - return NGX_ERROR; - } - - *h = ngx_http_index_handler; - - return NGX_OK; -}