comparison src/http/modules/ngx_http_static_module.c @ 4494:13e09cf11d4e

Disable symlinks: initialization of the "disable_symlinks" field in ngx_open_file_info_t moved to a separate function. This is preparation for the "from=" parameter implementation of the "disable_symlinks" directive.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 27 Feb 2012 16:51:28 +0000
parents 08713bac87fc
children 192f54280a7a
comparison
equal deleted inserted replaced
4493:47ece8818978 4494:13e09cf11d4e
92 of.directio = clcf->directio; 92 of.directio = clcf->directio;
93 of.valid = clcf->open_file_cache_valid; 93 of.valid = clcf->open_file_cache_valid;
94 of.min_uses = clcf->open_file_cache_min_uses; 94 of.min_uses = clcf->open_file_cache_min_uses;
95 of.errors = clcf->open_file_cache_errors; 95 of.errors = clcf->open_file_cache_errors;
96 of.events = clcf->open_file_cache_events; 96 of.events = clcf->open_file_cache_events;
97 #if (NGX_HAVE_OPENAT) 97
98 of.disable_symlinks = clcf->disable_symlinks; 98 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) {
99 #endif 99 return NGX_HTTP_INTERNAL_SERVER_ERROR;
100 }
100 101
101 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) 102 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
102 != NGX_OK) 103 != NGX_OK)
103 { 104 {
104 switch (of.err) { 105 switch (of.err) {