diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:23:49 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:23:49 +0000 |
| commit | 7571f6c962e5b02abf01b2f1c9f84cb109728d4d (patch) | |
| tree | 5170b786a8b635703d8d7e1d61bf16bb94ac85b3 /src/core/ngx_file.c | |
| parent | 7201f40d9fa6e0bf548dffb76e8fb6ab7bac5cf6 (diff) | |
| download | nginx-7571f6c962e5b02abf01b2f1c9f84cb109728d4d.tar.gz nginx-7571f6c962e5b02abf01b2f1c9f84cb109728d4d.tar.bz2 | |
merge r3017, r3018, r3019, r3020, r3021, r3022, r3023, r3196:
cache management fixes:
*) separate cache loader process
*) use real file cache length, this fixes cache size counting for responses
without "Content-Length" header and 304 responses.
Diffstat (limited to 'src/core/ngx_file.c')
| -rw-r--r-- | src/core/ngx_file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 3f47fc98b..19ed86df0 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -264,7 +264,8 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } path->len = 0; - path->manager = (ngx_path_manager_pt) cmd->post; + path->manager = NULL; + path->loader = NULL; path->conf_file = cf->conf_file->file.name.data; path->line = cf->conf_file->line; @@ -325,6 +326,7 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev, + init->level[2] + (init->level[2] ? 1 : 0); (*path)->manager = NULL; + (*path)->loader = NULL; (*path)->conf_file = NULL; if (ngx_add_path(cf, path) != NGX_OK) { |