diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-07-20 21:15:59 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-07-20 21:15:59 +0000 |
| commit | 890fc9659609396f9df4dff47a2be77cd652fe55 (patch) | |
| tree | b6694fd45d26bc9607ceb41608619dbbf4ccb23c /src/http/modules/ngx_http_index_handler.c | |
| parent | 8e1fbe61b69562d838aafda8d75798993f022d4a (diff) | |
| download | nginx-890fc9659609396f9df4dff47a2be77cd652fe55.tar.gz nginx-890fc9659609396f9df4dff47a2be77cd652fe55.zip | |
nginx-0.0.1-2003-07-21-01:15:59 import
Diffstat (limited to 'src/http/modules/ngx_http_index_handler.c')
| -rw-r--r-- | src/http/modules/ngx_http_index_handler.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/http/modules/ngx_http_index_handler.c b/src/http/modules/ngx_http_index_handler.c index c6c111716..7c348e2ad 100644 --- a/src/http/modules/ngx_http_index_handler.c +++ b/src/http/modules/ngx_http_index_handler.c @@ -15,11 +15,11 @@ typedef struct { static int ngx_http_index_test_dir(ngx_http_request_t *r); static int ngx_http_index_init(ngx_cycle_t *cycle); -static void *ngx_http_index_create_conf(ngx_pool_t *pool); -static char *ngx_http_index_merge_conf(ngx_pool_t *p, void *parent, - void *child); +static void *ngx_http_index_create_conf(ngx_conf_t *cf); +static char *ngx_http_index_merge_conf(ngx_conf_t *cf, + void *parent, void *child); static char *ngx_http_index_set_index(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf); + void *conf); static ngx_command_t ngx_http_index_commands[] = { @@ -220,14 +220,15 @@ static int ngx_http_index_init(ngx_cycle_t *cycle) } -static void *ngx_http_index_create_conf(ngx_pool_t *pool) +static void *ngx_http_index_create_conf(ngx_conf_t *cf) { ngx_http_index_conf_t *conf; - ngx_test_null(conf, ngx_palloc(pool, sizeof(ngx_http_index_conf_t)), + ngx_test_null(conf, ngx_palloc(cf->pool, sizeof(ngx_http_index_conf_t)), NGX_CONF_ERROR); - ngx_init_array(conf->indices, pool, 3, sizeof(ngx_str_t), NGX_CONF_ERROR); + ngx_init_array(conf->indices, cf->pool, 3, sizeof(ngx_str_t), + NGX_CONF_ERROR); conf->max_index_len = 0; return conf; @@ -236,7 +237,8 @@ static void *ngx_http_index_create_conf(ngx_pool_t *pool) /* TODO: remove duplicate indices */ -static char *ngx_http_index_merge_conf(ngx_pool_t *p, void *parent, void *child) +static char *ngx_http_index_merge_conf(ngx_conf_t *cf, + void *parent, void *child) { ngx_http_index_conf_t *prev = parent; ngx_http_index_conf_t *conf = child; |