Mercurial > hg > nginx
diff src/http/ngx_http_file_cache.c @ 2716:d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 16 Apr 2009 19:25:09 +0000 |
parents | 49a1382b249b |
children | b3b8c66bd520 |
line wrap: on
line diff
--- a/src/http/ngx_http_file_cache.c Thu Apr 16 14:42:31 2009 +0000 +++ b/src/http/ngx_http_file_cache.c Thu Apr 16 19:25:09 2009 +0000 @@ -54,7 +54,7 @@ ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0, "cache \"%V\" uses the \"%V\" cache path " "while previously it used the \"%V\" cache path", - &shm_zone->name, &cache->path->name, + &shm_zone->shm.name, &cache->path->name, &ocache->path->name); return NGX_ERROR; @@ -112,7 +112,7 @@ cache->max_size /= cache->bsize; - len = sizeof(" in cache keys zone \"\"") + shm_zone->name.len; + len = sizeof(" in cache keys zone \"\"") + shm_zone->shm.name.len; cache->shpool->log_ctx = ngx_slab_alloc(cache->shpool, len); if (cache->shpool->log_ctx == NULL) { @@ -120,7 +120,7 @@ } ngx_sprintf(cache->shpool->log_ctx, " in cache keys zone \"%V\"%Z", - &shm_zone->name); + &shm_zone->shm.name); return NGX_OK; } @@ -1399,6 +1399,8 @@ p = (u_char *) ngx_strchr(name.data, ':'); if (p) { + *p = '\0'; + name.len = p - name.data; p++;