Mercurial > hg > nginx
diff src/http/modules/ngx_http_log_module.c @ 4478:08713bac87fc
Support for disable_symlinks in various modules.
author | Andrey Belov <defan@nginx.com> |
---|---|
date | Mon, 13 Feb 2012 16:32:21 +0000 |
parents | 41f640a693de |
children | 13e09cf11d4e |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_log_module.c +++ b/src/http/modules/ngx_http_log_module.c @@ -373,6 +373,8 @@ ngx_http_log_script_write(ngx_http_reque ngx_http_log_loc_conf_t *llcf; ngx_http_core_loc_conf_t *clcf; + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + if (!r->root_tested) { /* test root directory existance */ @@ -384,8 +386,6 @@ ngx_http_log_script_write(ngx_http_reque path.data[root] = '\0'; - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - ngx_memzero(&of, sizeof(ngx_open_file_info_t)); of.valid = clcf->open_file_cache_valid; @@ -394,6 +394,9 @@ ngx_http_log_script_write(ngx_http_reque of.test_only = 1; of.errors = clcf->open_file_cache_errors; of.events = clcf->open_file_cache_events; +#if (NGX_HAVE_OPENAT) + of.disable_symlinks = clcf->disable_symlinks; +#endif if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) != NGX_OK) @@ -441,6 +444,9 @@ ngx_http_log_script_write(ngx_http_reque of.valid = llcf->open_file_cache_valid; of.min_uses = llcf->open_file_cache_min_uses; of.directio = NGX_OPEN_FILE_DIRECTIO_OFF; +#if (NGX_HAVE_OPENAT) + of.disable_symlinks = clcf->disable_symlinks; +#endif if (ngx_open_cached_file(llcf->open_file_cache, &log, &of, r->pool) != NGX_OK)