comparison src/http/modules/ngx_http_gzip_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 2b6cb7528409
comparison
equal deleted inserted replaced
4493:47ece8818978 4494:13e09cf11d4e
127 of.directio = clcf->directio; 127 of.directio = clcf->directio;
128 of.valid = clcf->open_file_cache_valid; 128 of.valid = clcf->open_file_cache_valid;
129 of.min_uses = clcf->open_file_cache_min_uses; 129 of.min_uses = clcf->open_file_cache_min_uses;
130 of.errors = clcf->open_file_cache_errors; 130 of.errors = clcf->open_file_cache_errors;
131 of.events = clcf->open_file_cache_events; 131 of.events = clcf->open_file_cache_events;
132 #if (NGX_HAVE_OPENAT) 132
133 of.disable_symlinks = clcf->disable_symlinks; 133 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) {
134 #endif 134 return NGX_HTTP_INTERNAL_SERVER_ERROR;
135 }
135 136
136 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) 137 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
137 != NGX_OK) 138 != NGX_OK)
138 { 139 {
139 switch (of.err) { 140 switch (of.err) {