diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-03-30 07:45:55 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-03-30 07:45:55 +0000 |
commit | 19298ec1d3b426ec33c4f06209d96edfbaf7f9de (patch) | |
tree | 2f717d2f64ec3ef3ee9083d79a799dd8c0b24329 /src/core | |
parent | 1be7419d10a4c2226783f280af9e2aa7ff48b738 (diff) | |
download | nginx-19298ec1d3b426ec33c4f06209d96edfbaf7f9de.tar.gz nginx-19298ec1d3b426ec33c4f06209d96edfbaf7f9de.zip |
introduce cache manager instead of cache cleaner
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/ngx_file.c | 4 | ||||
-rw-r--r-- | src/core/ngx_file.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index fed19e690..6bff833d6 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -264,7 +264,7 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } path->len = 0; - path->cleaner = (ngx_path_cleaner_pt) cmd->post; + path->manager = (ngx_path_manager_pt) cmd->post; path->conf_file = cf->conf_file->file.name.data; path->line = cf->conf_file->line; @@ -324,7 +324,7 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev, + init->level[1] + (init->level[1] ? 1 : 0) + init->level[2] + (init->level[2] ? 1 : 0); - (*path)->cleaner = NULL; + (*path)->manager = NULL; (*path)->conf_file = NULL; if (ngx_add_path(cf, path) != NGX_OK) { diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index 7890c48cc..264ba391b 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -29,7 +29,7 @@ struct ngx_file_s { #define NGX_MAX_PATH_LEVEL 3 -typedef time_t (*ngx_path_cleaner_pt) (void *data); +typedef time_t (*ngx_path_manager_pt) (void *data); typedef struct { @@ -37,7 +37,7 @@ typedef struct { size_t len; size_t level[3]; - ngx_path_cleaner_pt cleaner; + ngx_path_manager_pt manager; void *data; u_char *conf_file; |